From 6737e59577500bcd94c791cca2f2fb5b1f4a9708 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Mon, 15 Aug 2016 14:29:58 -0700 Subject: [PATCH] Add support for using GCP Image Family names. (#8083) --- r/compute_instance.html.markdown | 6 +++--- r/compute_instance_template.html.markdown | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/r/compute_instance.html.markdown b/r/compute_instance.html.markdown index 3164f106..a9f10244 100644 --- a/r/compute_instance.html.markdown +++ b/r/compute_instance.html.markdown @@ -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). - diff --git a/r/compute_instance_template.html.markdown b/r/compute_instance_template.html.markdown index be56da80..52cfd176 100644 --- a/r/compute_instance_template.html.markdown +++ b/r/compute_instance_template.html.markdown @@ -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.