Skip to content

Commit

Permalink
Add scratch_disk property to google_compute_instance and deprecat…
Browse files Browse the repository at this point in the history
…e `disk` (hashicorp#123)

* Add scratch_disk property to google_compute_instance

* docs for scratch_disk

* limit scope of scratchDisks array by using bool, test formatting

* add slash back to disk check
  • Loading branch information
danawillow authored Jun 28, 2017
1 parent f63b1d9 commit 71d52a3
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions docs/r/compute_instance.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ The following arguments are supported:

- - -

* `scratch_disk` - (Optional) Scratch disks to attach to the instance. This can be
specified multiple times for multiple scratch disks. Structure is documented below.

* `can_ip_forward` - (Optional) Whether to allow sending and receiving of
packets with non-matching source or destination IPs.
This defaults to false.
Expand All @@ -85,9 +88,6 @@ The following arguments are supported:

* `description` - (Optional) A brief description of this resource.

* `disk` - (Optional) Disks to attach to the instance. This can be specified
multiple times for multiple disks. Structure is documented below.

* `labels` - (Optional) A set of key/value label pairs to assign to the instance.

* `metadata` - (Optional) Metadata key/value pairs to make available from
Expand All @@ -112,6 +112,9 @@ The following arguments are supported:

---

* `disk` - (DEPRECATED) Disks to attach to the instance. This can be specified
multiple times for multiple disks. Structure is documented below.

* `network` - (DEPRECATED) Networks to attach to the instance. This
can be specified multiple times for multiple networks. Structure is
documented below.
Expand Down Expand Up @@ -151,7 +154,12 @@ The `initialize_params` block supports:
`global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
`{project}/{image}`, `{family}`, or `{image}`.

The `disk` block supports: (Note that either disk or image is required, unless
The `scratch_disk` block supports:

* `interface` - (Optional) The disk interface to use for attaching this disk; either SCSI or NVME.
Defaults to SCSI.

(DEPRECATED) 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).

* `disk` - The name of the existing disk (such as those managed by
Expand Down

0 comments on commit 71d52a3

Please sign in to comment.