public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-22 09:36:00 +00:00
Code Issues Projects Releases Wiki Activity

Add support for using GCP Image Family names. (#8083)

Browse Source
This commit is contained in:
Christoph Blecker 2016-08-15 14:29:58 -07:00 committed by Paul Stack
parent a21fc31e00
commit 6737e59577
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r/compute_instance.html.markdown
View File

@ -112,8 +112,9 @@ the type is "local-ssd", in which case scratch must be true).
`google_compute_disk`) to attach.
* `image` - The image from which to initialize this
disk. Either the full URL, a contraction of the form "project/name", or
just a name (in which case the current project is used).
disk. Either the full URL, a contraction of the form "project/name", an
[image family](https://cloud.google.com/compute/docs/images#image_families),
or just a name (in which case the current project is used).
* `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
This defaults to true. Leave true for local SSDs.
@ -195,4 +196,3 @@ exported:
* `network_interface.0.address` - The internal ip address of the instance, either manually or dynamically assigned.
* `network_interface.0.access_config.0.assigned_nat_ip` - If the instance has an access config, either the given external ip (in the `nat_ip` field) or the ephemeral (generated) ip (if you didn't provide one).

4
r/compute_instance_template.html.markdown
View File

@ -83,7 +83,7 @@ resource "google_compute_instance_template" "instance_template" {
network_interface {
...
}
lifecycle {
create_before_destroy = true
}
@ -169,7 +169,7 @@ The `disk` block supports:
to the name of the instance.
* `source_image` - (Required if source not set) The name of the image to base
this disk off of.
this disk off of. Accepts same arguments as a [google_compute_instance image](https://www.terraform.io/docs/providers/google/r/compute_instance.html#image).
* `interface` - (Optional) Specifies the disk interface to use for attaching
this disk.