stage c nva (#2172)

GoogleCloudPlatform · Mar 24, 2024 · 52b5bd0 · 52b5bd0
1 parent 796ad00
commit 52b5bd0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/fast/stages/2-networking-c-nva/data/subnets/dmz/dmz-ew1.yaml b/fast/stages/2-networking-c-nva/data/subnets/dmz/dmz-ew1.yaml
@@ -1,6 +1,6 @@
 # skip boilerplate check
 
-name: dmz
+name: dmz-default
 region: europe-west1
 ip_cidr_range: 10.64.128.0/24
 description: Default europe-west1 subnet for landing dmz
diff --git a/fast/stages/2-networking-c-nva/data/subnets/dmz/dmz-ew4.yaml b/fast/stages/2-networking-c-nva/data/subnets/dmz/dmz-ew4.yaml
@@ -1,6 +1,6 @@
 # skip boilerplate check
 
-name: dmz
+name: dmz-default
 region: europe-west4
 ip_cidr_range: 10.80.128.0/24
 description: Default europe-west4 subnet for landing dmz
diff --git a/fast/stages/2-networking-c-nva/nva.tf b/fast/stages/2-networking-c-nva/nva.tf
@@ -41,10 +41,9 @@ locals {
   nva_locality = {
     for v in setproduct(keys(var.regions), local.nva_zones) :
     join("-", v) => {
-      name      = v.0
-      region    = var.regions[v.0]
-      shortname = local.region_shortnames[var.regions[v.0]]
-      zone      = v.1
+      name   = v.0
+      region = var.regions[v.0]
+      zone   = v.1
     }
   }
   nva_zones = ["b", "c"]
@@ -123,9 +122,8 @@ module "nva-mig" {
 module "ilb-nva-dmz" {
   for_each = {
     for k, v in var.regions : k => {
-      region    = v
-      shortname = local.region_shortnames[v]
-      subnet    = "${v}/dmz-default-${local.region_shortnames[v]}"
+      region = v
+      subnet = "${v}/dmz-default"
     }
   }
   source        = "../../../modules/net-lb-int"
@@ -158,9 +156,8 @@ module "ilb-nva-dmz" {
 module "ilb-nva-landing" {
   for_each = {
     for k, v in var.regions : k => {
-      region    = v
-      shortname = local.region_shortnames[v]
-      subnet    = "${v}/landing-default-${local.region_shortnames[v]}"
+      region = v
+      subnet = "${v}/landing-default"
     }
   }
   source        = "../../../modules/net-lb-int"

diff --git a/fast/stages/2-networking-c-nva/test-resources.tf b/fast/stages/2-networking-c-nva/test-resources.tf
@@ -25,7 +25,7 @@
 #   name       = "test-vm-lnd-unt-pri-0"
 #   network_interfaces = [{
 #     network    = module.dmz-vpc.self_link
-#     subnetwork = module.dmz-vpc.subnet_self_links["${var.regions.primary}/dmz-default-${local.region_shortnames[var.regions.primary]}"]
+#     subnetwork = module.dmz-vpc.subnet_self_links["${var.regions.primary}/dmz-default"]
 #   }]
 #   tags                   = ["primary", "ssh"]
 #   service_account_create = true
@@ -53,7 +53,7 @@
 #   name       = "test-vm-lnd-unt-sec-0"
 #   network_interfaces = [{
 #     network    = module.dmz-vpc.self_link
-#     subnetwork = module.dmz-vpc.subnet_self_links["${var.regions.secondary}/dmz-default-${local.region_shortnames[var.regions.secondary]}"]
+#     subnetwork = module.dmz-vpc.subnet_self_links["${var.regions.secondary}/dmz-default"]
 #   }]
 #   tags                   = ["secondary", "ssh"]
 #   service_account_create = true
@@ -83,7 +83,7 @@
 #   name       = "test-vm-lnd-tru-pri-0"
 #   network_interfaces = [{
 #     network    = module.landing-vpc.self_link
-#     subnetwork = module.landing-vpc.subnet_self_links["${var.regions.primary}/landing-default-${local.region_shortnames[var.regions.primary]}"]
+#     subnetwork = module.landing-vpc.subnet_self_links["${var.regions.primary}/landing-default"]
 #   }]
 #   tags                   = ["primary", "ssh"]
 #   service_account_create = true
@@ -111,7 +111,7 @@
 #   name       = "test-vm-lnd-tru-sec-0"
 #   network_interfaces = [{
 #     network    = module.landing-vpc.self_link
-#     subnetwork = module.landing-vpc.subnet_self_links["${var.regions.secondary}/landing-default-${local.region_shortnames[var.regions.secondary]}"]
+#     subnetwork = module.landing-vpc.subnet_self_links["${var.regions.secondary}/landing-default"]
 #   }]
 #   tags                   = ["secondary", "ssh"]
 #   service_account_create = true
@@ -142,7 +142,7 @@
 #   network_interfaces = [{
 #     network = module.dev-spoke-vpc.self_link
 #     # change the subnet name to match the values you are actually using
-#     subnetwork = module.dev-spoke-vpc.subnet_self_links["${var.regions.primary}/dev-default-${local.region_shortnames[var.regions.primary]}"]
+#     subnetwork = module.dev-spoke-vpc.subnet_self_links["${var.regions.primary}/dev-default"]
 #   }]
 #   tags                   = ["primary", "ssh"]
 #   service_account_create = true
@@ -171,7 +171,7 @@
 #   network_interfaces = [{
 #     network = module.dev-spoke-vpc.self_link
 #     # change the subnet name to match the values you are actually using
-#     subnetwork = module.dev-spoke-vpc.subnet_self_links["${var.regions.secondary}/dev-default-${local.region_shortnames[var.regions.secondary]}"]
+#     subnetwork = module.dev-spoke-vpc.subnet_self_links["${var.regions.secondary}/dev-default"]
 #   }]
 #   tags                   = ["secondary", "ssh"]
 #   service_account_create = true
@@ -202,7 +202,7 @@
 #   network_interfaces = [{
 #     network = module.prod-spoke-vpc.self_link
 #     # change the subnet name to match the values you are actually using
-#     subnetwork = module.prod-spoke-vpc.subnet_self_links["${var.regions.primary}/prod-default-${local.region_shortnames[var.regions.primary]}"]
+#     subnetwork = module.prod-spoke-vpc.subnet_self_links["${var.regions.primary}/prod-default"]
 #   }]
 #   tags                   = ["primary", "ssh"]
 #   service_account_create = true
@@ -233,7 +233,7 @@
 #   network_interfaces = [{
 #     network = module.prod-spoke-vpc.self_link
 #     # change the subnet name to match the values you are actually using
-#     subnetwork = module.prod-spoke-vpc.subnet_self_links["${var.regions.secondary}/prod-default-${local.region_shortnames[var.regions.secondary]}"]
+#     subnetwork = module.prod-spoke-vpc.subnet_self_links["${var.regions.secondary}/prod-default"]
 #   }]
 #   tags                   = ["secondary", "ssh"]
 #   service_account_create = true