From 1ed8a4720e20d15c536f67a369b4862b193fdb56 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Tue, 31 Jan 2017 16:45:13 -0700 Subject: [PATCH] Update compute_instance.html.markdown Putting all required attributes next to each other for readability and separating deprecated attributes --- .../google/r/compute_instance.html.markdown | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/website/source/docs/providers/google/r/compute_instance.html.markdown b/website/source/docs/providers/google/r/compute_instance.html.markdown index b015f1510..7a0ad7567 100644 --- a/website/source/docs/providers/google/r/compute_instance.html.markdown +++ b/website/source/docs/providers/google/r/compute_instance.html.markdown @@ -69,6 +69,10 @@ The following arguments are supported: * `zone` - (Required) The zone that the machine should be created in. +* `network_interface` - (Required) Networks to attach to the instance. This can + be specified multiple times for multiple networks, but GCE is currently + limited to just 1. Structure is documented below. + - - - * `can_ip_forward` - (Optional) Whether to allow sending and receiving of @@ -86,14 +90,6 @@ The following arguments are supported: startup-script metadata key on the created instance and thus the two mechanisms are not allowed to be used simultaneously. -* `network_interface` - (Required) Networks to attach to the instance. This can - be specified multiple times for multiple networks, but GCE is currently - limited to just 1. Structure is documented below. - -* `network` - (DEPRECATED, Required) Networks to attach to the instance. This - can be specified multiple times for multiple networks. Structure is - documented below. - * `project` - (Optional) The project in which the resource belongs. If it is not provided, the provider project is used. @@ -107,6 +103,12 @@ The following arguments are supported: * `create_timeout` - (Optional) Configurable timeout in minutes for creating instances. Default is 4 minutes. Changing this forces a new resource to be created. + +--- + +* `network` - (DEPRECATED, Required) Networks to attach to the instance. This + can be specified multiple times for multiple networks. Structure is + documented below. The `disk` block supports: (Note that either disk or image is required, unless the type is "local-ssd", in which case scratch must be true). @@ -212,4 +214,4 @@ exported: * `disk.0.disk_encryption_key_sha256` - The [RFC 4648 base64](https://tools.ietf.org/html/rfc4648#section-4) encoded SHA-256 hash of the [customer-supplied encryption key] - (https://cloud.google.com/compute/docs/disks/customer-supplied-encryption) that protects this resource. \ No newline at end of file + (https://cloud.google.com/compute/docs/disks/customer-supplied-encryption) that protects this resource.