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

Allow specifying project or full URL when specifying image

Browse Source
This commit is contained in:
Dave Cunningham 2015-01-29 20:00:02 -05:00
parent 485e6b550d
commit a98e9e89c7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r/compute_disk.html.markdown
View File

@ -30,7 +30,9 @@ The following arguments are supported:
* `zone` - (Required) The zone where this disk will be available.
* `image` - (Optional) The machine image to base this disk off of.
* `image` - (Optional) 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).
* `size` - (Optional) The size of the image in gigabytes. If not specified,
it will inherit the size of its base image.

5
r/compute_instance.html.markdown
View File

@ -73,8 +73,9 @@ The `disk` block supports:
* `disk` - (Required if image not set) The name of the disk (such as
those managed by `google_compute_disk`) to attach.
* `image` - (Required if disk not set) The name of the image to base
this disk off of.
* `image` - (Required if disk not set) 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).
* `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
This defaults to true.