From b5333fe9d95d5779795bfc50499cf04424f9c9da Mon Sep 17 00:00:00 2001 From: zbikmarc Date: Thu, 12 Jan 2017 15:05:13 +0100 Subject: [PATCH 1/2] providers/google: Add subnetwork_project field to enable cross-project networking in instance templates (#11110) * Add subnetwork_project field to allow for XPN in GCE instance templates * Missing os import * Removing unneeded check * fix formatting * Add subnetwork_project to read --- r/compute_instance_template.html.markdown | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/r/compute_instance_template.html.markdown b/r/compute_instance_template.html.markdown index 201abc33..796cb4e9 100644 --- a/r/compute_instance_template.html.markdown +++ b/r/compute_instance_template.html.markdown @@ -138,7 +138,7 @@ The following arguments are supported: * `metadata_startup_script` - (Optional) An alternative to using the startup-script metadata key, mostly to match the compute_instance resource. - This replaces the startup-script metadata key on the created instance and + This replaces the startup-script metadata key on the created instance and thus the two mechanisms are not allowed to be used simultaneously. * `network_interface` - (Required) Networks to attach to instances created from @@ -208,6 +208,9 @@ The `network_interface` block supports: to. The subnetwork must exist in the same `region` this instance will be created in. Either `network` or `subnetwork` must be provided. +* `subnetwork_project` - (Optional) The project in which the subnetwork belongs. + If it is not provided, the provider project is used. + * `access_config` - (Optional) Access configurations, i.e. IPs via which this instance can be accessed via the Internet. Omit to ensure that the instance is not accessible from the Internet (this means that ssh provisioners will From e789ba3faba1def1a62f3c08e40d263a5913b8e9 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Fri, 13 Jan 2017 02:51:03 -0800 Subject: [PATCH 2/2] providers/google: Add link to setIamPolicy restrictions in iam docs (#11188) --- d/google_iam_policy.html.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/d/google_iam_policy.html.markdown b/d/google_iam_policy.html.markdown index 01d94012..81be62a1 100644 --- a/d/google_iam_policy.html.markdown +++ b/d/google_iam_policy.html.markdown @@ -33,6 +33,10 @@ This data source is used to define IAM policies to apply to other resources. Currently, defining a policy through a datasource and referencing that policy from another resource is the only way to apply an IAM policy to a resource. +**Note:** Several restrictions apply when setting IAM policies through this API. +See the [setIamPolicy docs](https://cloud.google.com/resource-manager/reference/rest/v1/projects/setIamPolicy) +for a list of these restrictions. + ## Argument Reference The following arguments are supported: