Merge branch 'master' into org-policy

terraform-google-modules · Sep 20, 2024 · 58e3f29 · 58e3f29
2 parents bbd5332 + bf8c7cb
commit 58e3f29
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/examples/compute_instance/simple/main.tf b/examples/compute_instance/simple/main.tf
@@ -18,10 +18,11 @@ module "instance_template" {
   source  = "terraform-google-modules/vm/google//modules/instance_template"
   version = "~> 11.0"
 
-  region          = var.region
-  project_id      = var.project_id
-  subnetwork      = var.subnetwork
-  service_account = var.service_account
+  region             = var.region
+  project_id         = var.project_id
+  subnetwork         = var.subnetwork
+  subnetwork_project = var.project_id
+  service_account    = var.service_account
 }
 
 module "compute_instance" {
@@ -31,6 +32,7 @@ module "compute_instance" {
   region              = var.region
   zone                = var.zone
   subnetwork          = var.subnetwork
+  subnetwork_project  = var.project_id
   num_instances       = var.num_instances
   hostname            = "instance-simple"
   instance_template   = module.instance_template.self_link

diff --git a/examples/umig/named_ports/main.tf b/examples/umig/named_ports/main.tf
@@ -35,6 +35,7 @@ module "umig" {
 
   project_id        = var.project_id
   subnetwork        = var.subnetwork
+  subnetwork_project = var.project_id
   num_instances     = var.num_instances
   hostname          = "umig-named-ports"
   instance_template = module.instance_template.self_link

diff --git a/examples/umig/simple/main.tf b/examples/umig/simple/main.tf
@@ -24,9 +24,10 @@ module "instance_template" {
   source  = "terraform-google-modules/vm/google//modules/instance_template"
   version = "~> 11.0"
 
-  project_id      = var.project_id
-  subnetwork      = var.subnetwork
-  service_account = var.service_account
+  project_id         = var.project_id
+  subnetwork         = var.subnetwork
+  subnetwork_project = var.project_id
+  service_account    = var.service_account
 }
 
 module "umig" {
@@ -35,6 +36,7 @@ module "umig" {
 
   project_id        = var.project_id
   subnetwork        = var.subnetwork
+  subnetwork_project = var.project_id
   num_instances     = var.num_instances
   hostname          = "umig-simple"
   instance_template = module.instance_template.self_link

diff --git a/examples/umig/static_ips/main.tf b/examples/umig/static_ips/main.tf
@@ -24,9 +24,10 @@ module "instance_template" {
   source  = "terraform-google-modules/vm/google//modules/instance_template"
   version = "~> 11.0"
 
-  project_id      = var.project_id
-  subnetwork      = var.subnetwork
-  service_account = var.service_account
+  project_id         = var.project_id
+  subnetwork         = var.subnetwork
+  subnetwork_project = var.project_id
+  service_account    = var.service_account
 }
 
 module "umig" {
@@ -35,6 +36,7 @@ module "umig" {
 
   project_id        = var.project_id
   subnetwork        = var.subnetwork
+  subnetwork_project = var.project_id
   num_instances     = var.num_instances
   hostname          = "umig-static-ips"
   instance_template = module.instance_template.self_link