public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-10-03 01:01:06 +00:00
Code Issues Projects Releases Wiki Activity

Finish GH-1323 (#1574)

Browse Source 
* Clarify format of GCP machineType property

This should not be in a URL style formatting, which the previous language seemed to be implying

* machineType docs for compute_instance_template

* Remove some accidental spaces

* Update from feedback

Closes GH-1323
This commit is contained in:
Seth Vargo 2018-06-01 18:45:49 -04:00 committed by Vincent Roseberry
parent e9cf800ed3
commit 3f9a5da0af
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/docs/r/compute_instance.html.markdown
View File

@ -61,10 +61,11 @@ The following arguments are supported:
* `boot_disk` - (Required) The boot disk for the instance.
Structure is documented below.
* `machine_type` - (Required) The machine type to create. To create a custom
machine type, value should be set as specified
[here](https://cloud.google.com/compute/docs/reference/latest/instances#machineType).
**Note**: [`allow_stopping_for_update`](#allow_stopping_for_update) must be set to true in order to update this field.
* `machine_type` - (Required) The machine type to create.
**Note:** If you want to update this value (resize the VM) after initial creation, you must set [`allow_stopping_for_update`](#allow_stopping_for_update) to `true`.
To create a machine with a [custom type][custom-vm-types] (such as extended memory), format the value like `custom-VCPUS-MEM_IN_MB` like `custom-6-20480` for 6 vCPU and 20GB of RAM.
* `name` - (Required) A unique name for the resource, required by GCE.
Changing this forces a new resource to be created.
@ -307,3 +308,5 @@ Instances can be imported using the `project`, `zone` and `name`, e.g.
```
$ terraform import google_compute_instance.default gcp-project/us-central1-a/test
```
[custom-vm-types]: https://cloud.google.com/dataproc/docs/concepts/compute/custom-machine-types

6
website/docs/r/compute_instance_template.html.markdown
View File

@ -121,6 +121,10 @@ The following arguments are supported:
* `machine_type` - (Required) The machine type to create.
**Note:** If you want to update this value (resize the VM) after initial creation, you must set [`allow_stopping_for_update`](#allow_stopping_for_update) to `true`.
To create a machine with a [custom type][custom-vm-types] (such as extended memory), format the value like `custom-VCPUS-MEM_IN_MB` like `custom-6-20480` for 6 vCPU and 20GB of RAM.
- - -
* `name` - (Optional) The name of the instance template. If you leave
this blank, Terraform will auto-generate a unique name.
@ -306,3 +310,5 @@ Instance templates can be imported using the `name`, e.g.
```
$ terraform import google_compute_instance_template.default appserver-template
```
[custom-vm-types]: https://cloud.google.com/dataproc/docs/concepts/compute/custom-machine-types