mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-03 01:01:06 +00:00
Merge remote-tracking branch 'upstream/master' into gcp_compute_disk_snapshot
This commit is contained in:
Thomas Poindessous
commit
79bc3702ce
@ -62,19 +62,6 @@ The following keys can be used to configure the provider.
|
||||
* `GCLOUD_REGION`
|
||||
* `CLOUDSDK_COMPUTE_REGION`
|
||||
|
||||
The following keys are supported for backwards compatibility, and may be
|
||||
removed in a future version:
|
||||
|
||||
* `account_file` - __Deprecated: please use `credentials` instead.__
|
||||
Path to or contents of the JSON file used to describe your
|
||||
account credentials, downloaded from Google Cloud Console. More details on
|
||||
retrieving this file are below. The `account file` can be "" if you are running
|
||||
terraform from a GCE instance with a properly-configured [Compute Engine
|
||||
Service Account](https://cloud.google.com/compute/docs/authentication). This
|
||||
can also be specified with the `GOOGLE_ACCOUNT_FILE` shell environment
|
||||
variable.
|
||||
|
||||
|
||||
## Authentication JSON File
|
||||
|
||||
Authenticating with Google Cloud services requires a JSON
|
||||
|
||||
@ -37,9 +37,11 @@ The following arguments are supported:
|
||||
encoded in [RFC 4648 base64](https://tools.ietf.org/html/rfc4648#section-4)
|
||||
to encrypt this disk.
|
||||
|
||||
* `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).
|
||||
* `image` - (Optional) The image from which to initialize this disk. This can be
|
||||
one of: the image's `self_link`, `projects/{project}/global/images/{image}`,
|
||||
`projects/{project}/global/images/family/{family}`, `global/images/{image}`,
|
||||
`global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
|
||||
`{project}/{image}`, `{family}`, or `{image}`.
|
||||
|
||||
* `project` - (Optional) The project in which the resource belongs. If it
|
||||
is not provided, the provider project is used.
|
||||
|
||||
@ -10,7 +10,7 @@ description: |-
|
||||
|
||||
Manages a Global Forwarding Rule within GCE. This binds an ip and port to a target HTTP(s) proxy. For more
|
||||
information see [the official
|
||||
documentation](https://cloud.google.com/compute/docs/load-balancing/network/forwarding-rules) and
|
||||
documentation](https://cloud.google.com/compute/docs/load-balancing/http/global-forwarding-rules) and
|
||||
[API](https://cloud.google.com/compute/docs/reference/latest/globalForwardingRules).
|
||||
|
||||
## Example Usage
|
||||
|
||||
@ -117,12 +117,11 @@ the type is "local-ssd", in which case scratch must be true).
|
||||
* `disk` - The name of the existing disk (such as those managed by
|
||||
`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", the
|
||||
name of a Google-supported
|
||||
[image family](https://cloud.google.com/compute/docs/images#image_families),
|
||||
or simple the name of an image or image family (in which case the current
|
||||
project is used).
|
||||
* `image` - The image from which to initialize this disk. This can be
|
||||
one of: the image's `self_link`, `projects/{project}/global/images/{image}`,
|
||||
`projects/{project}/global/images/family/{family}`, `global/images/{image}`,
|
||||
`global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
|
||||
`{project}/{image}`, `{family}`, or `{image}`.
|
||||
|
||||
* `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
|
||||
This defaults to true. Leave true for local SSDs.
|
||||
|
||||
@ -176,8 +176,12 @@ The `disk` block supports:
|
||||
* `disk_name` - (Optional) Name of the disk. When not provided, this defaults
|
||||
to the name of the instance.
|
||||
|
||||
* `source_image` - (Required if source not set) The name of the image to base
|
||||
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).
|
||||
* `source_image` - (Required if source not set) The image from which to
|
||||
initialize this disk. This can be one of: the image's `self_link`,
|
||||
`projects/{project}/global/images/{image}`,
|
||||
`projects/{project}/global/images/family/{family}`, `global/images/{image}`,
|
||||
`global/images/family/{family}`, `family/{family}`, `{project}/{family}`,
|
||||
`{project}/{image}`, `{family}`, or `{image}`.
|
||||
|
||||
* `interface` - (Optional) Specifies the disk interface to use for attaching
|
||||
this disk.
|
||||
|
||||
@ -56,7 +56,6 @@ resource "google_compute_health_check" "default" {
|
||||
name = "test"
|
||||
check_interval_sec = 1
|
||||
timeout_sec = 1
|
||||
type = "TCP"
|
||||
|
||||
tcp_health_check {
|
||||
port = "80"
|
||||
|
||||
@ -19,6 +19,24 @@ resource must have `roles/resourcemanager.projectCreator`. See the
|
||||
[Access Control for Organizations Using IAM](https://cloud.google.com/resource-manager/docs/access-control-org)
|
||||
doc for more information.
|
||||
|
||||
Note that prior to 0.8.5, `google_project` functioned like a data source,
|
||||
meaning any project referenced by it had to be created and managed outside
|
||||
Terraform. As of 0.8.5, `google_project` functions like any other Terraform
|
||||
resource, with Terraform creating and managing the project. To replicate the old
|
||||
behavior, either:
|
||||
|
||||
* Use the project ID directly in whatever is referencing the project, using the
|
||||
[google_project_iam_policy](/docs/providers/google/r/google_project_iam_policy.html)
|
||||
to replace the old `policy_data` property.
|
||||
* Use the [import](/docs/import/usage.html) functionality
|
||||
to import your pre-existing project into Terraform, where it can be referenced and
|
||||
used just like always, keeping in mind that Terraform will attempt to undo any changes
|
||||
made outside Terraform.
|
||||
|
||||
~> It's important to note that any project resources that were added to your Terraform config
|
||||
prior to 0.8.5 will continue to function as they always have, and will not be managed by
|
||||
Terraform. Only newly added projects are affected.
|
||||
|
||||
## Example Usage
|
||||
|
||||
```js
|
||||
@ -58,9 +76,6 @@ The following arguments are supported:
|
||||
* `name` - (Optional) The display name of the project.
|
||||
This is required if you are creating a new project.
|
||||
|
||||
* `services` - (Optional) The services/APIs that are enabled for this project.
|
||||
For a list of available services, run `gcloud beta service-management list`
|
||||
|
||||
* `skip_delete` - (Optional) If true, the Terraform resource can be deleted
|
||||
without deleting the Project via the Google API.
|
||||
|
||||
@ -81,7 +96,7 @@ exported:
|
||||
|
||||
## ID Field
|
||||
|
||||
In previous versions of Terraform, `google_project` resources used an `id` field in
|
||||
In versions of Terraform prior to 0.8.5, `google_project` resources used an `id` field in
|
||||
config files to specify the project ID. Unfortunately, due to limitations in Terraform,
|
||||
this field always looked empty to Terraform. Terraform fell back on using the project
|
||||
the Google Cloud provider is configured with. If you're using the `id` field in your
|
||||
|
||||
@ -11,6 +11,9 @@ description: |-
|
||||
Allows creation and management of an IAM policy for an existing Google Cloud
|
||||
Platform project.
|
||||
|
||||
~> **Be careful!** You can accidentally lock yourself out of your project
|
||||
using this resource. Proceed with caution.
|
||||
|
||||
## Example Usage
|
||||
|
||||
```js
|
||||
|
||||
Loading…
Reference in New Issue
Block a user