From 41c7266f8b15d674367a5b3d17334c97dc858e3b Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Tue, 5 May 2020 10:14:16 +0200 Subject: [PATCH] use region variable instead of subnet attribute in examples --- infrastructure/hub-and-spoke-peering/main.tf | 14 ++++++------- infrastructure/hub-and-spoke-vpn/main.tf | 20 +++++++++---------- .../onprem-google-access-dns/main.tf | 6 +++--- infrastructure/shared-vpc-gke/main.tf | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/infrastructure/hub-and-spoke-peering/main.tf b/infrastructure/hub-and-spoke-peering/main.tf index 88a9f7d0c..259a85ab0 100644 --- a/infrastructure/hub-and-spoke-peering/main.tf +++ b/infrastructure/hub-and-spoke-peering/main.tf @@ -78,7 +78,7 @@ module "vpc-spoke-1-firewall" { module "nat-spoke-1" { source = "../../modules/net-cloudnat" project_id = var.project_id - region = module.vpc-spoke-1.subnet_regions["${var.region}/spoke-1-default"] + region = var.region name = "spoke-1" router_name = "spoke-1" router_network = module.vpc-spoke-1.self_link @@ -124,7 +124,7 @@ module "vpc-spoke-2-firewall" { module "nat-spoke-2" { source = "../../modules/net-cloudnat" project_id = var.project_id - region = module.vpc-spoke-2.subnet_regions["${var.region}/spoke-2-default"] + region = var.region name = "spoke-2" router_name = "spoke-2" router_network = module.vpc-spoke-2.self_link @@ -146,8 +146,8 @@ module "hub-to-spoke-2-peering" { module "vm-spoke-1" { source = "../../modules/compute-vm" project_id = var.project_id - region = module.vpc-spoke-1.subnet_regions["${var.region}/spoke-1-default"] - zone = "${module.vpc-spoke-1.subnet_regions["${var.region}/spoke-1-default"]}-b" + region = var.region + zone = "${var.region}-b" name = "spoke-1-test" network_interfaces = [{ network = module.vpc-spoke-1.self_link, @@ -164,8 +164,8 @@ module "vm-spoke-1" { module "vm-spoke-2" { source = "../../modules/compute-vm" project_id = var.project_id - region = module.vpc-spoke-2.subnet_regions["${var.region}/spoke-2-default"] - zone = "${module.vpc-spoke-2.subnet_regions["${var.region}/spoke-2-default"]}-b" + region = var.region + zone = "${var.region}-b" name = "spoke-2-test" network_interfaces = [{ network = module.vpc-spoke-2.self_link, @@ -200,7 +200,7 @@ module "cluster-1" { source = "../../modules/gke-cluster" name = "cluster-1" project_id = var.project_id - location = "${module.vpc-spoke-2.subnet_regions["${var.region}/spoke-2-default"]}-b" + location = "${var.region}-b" network = module.vpc-spoke-2.self_link subnetwork = module.vpc-spoke-2.subnet_self_links["${var.region}/spoke-2-default"] secondary_range_pods = "pods" diff --git a/infrastructure/hub-and-spoke-vpn/main.tf b/infrastructure/hub-and-spoke-vpn/main.tf index c0c6d4440..6aba4fca3 100644 --- a/infrastructure/hub-and-spoke-vpn/main.tf +++ b/infrastructure/hub-and-spoke-vpn/main.tf @@ -58,7 +58,7 @@ module "vpc-hub-firewall" { module "vpn-hub-a" { source = "../../modules/net-vpn-dynamic" project_id = var.project_id - region = module.vpc-hub.subnet_regions["${var.regions.a}/hub-a"] + region = var.regions.a network = module.vpc-hub.name name = "hub-a" router_asn = var.bgp_asn.hub @@ -87,7 +87,7 @@ module "vpn-hub-a" { module "vpn-hub-b" { source = "../../modules/net-vpn-dynamic" project_id = var.project_id - region = module.vpc-hub.subnet_regions["${var.regions.b}/hub-b"] + region = var.regions.b network = module.vpc-hub.name name = "hub-b" router_asn = var.bgp_asn.hub @@ -148,7 +148,7 @@ module "vpc-spoke-1-firewall" { module "vpn-spoke-1" { source = "../../modules/net-vpn-dynamic" project_id = var.project_id - region = module.vpc-spoke-1.subnet_regions["${var.regions.a}/spoke-1-a"] + region = var.regions.a network = module.vpc-spoke-1.name name = "spoke-1" router_asn = var.bgp_asn.spoke-1 @@ -170,7 +170,7 @@ module "vpn-spoke-1" { module "nat-spoke-1" { source = "../../modules/net-cloudnat" project_id = var.project_id - region = module.vpc-spoke-1.subnet_regions["${var.regions.a}/spoke-1-a"] + region = var.regions.a name = "spoke-1" router_create = false router_name = module.vpn-spoke-1.router_name @@ -211,7 +211,7 @@ module "vpc-spoke-2-firewall" { module "vpn-spoke-2" { source = "../../modules/net-vpn-dynamic" project_id = var.project_id - region = module.vpc-spoke-2.subnet_regions["${var.regions.a}/spoke-2-a"] + region = var.regions.a network = module.vpc-spoke-2.name name = "spoke-2" router_asn = var.bgp_asn.spoke-2 @@ -233,7 +233,7 @@ module "vpn-spoke-2" { module "nat-spoke-2" { source = "../../modules/net-cloudnat" project_id = var.project_id - region = module.vpc-spoke-2.subnet_regions["${var.regions.a}/spoke-2-a"] + region = var.regions.a name = "spoke-2" router_create = false router_name = module.vpn-spoke-2.router_name @@ -246,8 +246,8 @@ module "nat-spoke-2" { module "vm-spoke-1" { source = "../../modules/compute-vm" project_id = var.project_id - region = module.vpc-spoke-1.subnet_regions["${var.regions.b}/spoke-1-b"] - zone = "${module.vpc-spoke-1.subnet_regions["${var.regions.b}/spoke-1-b"]}-b" + region = var.regions.b + zone = "${var.regions.b}-b" name = "spoke-1-test" network_interfaces = [{ network = module.vpc-spoke-1.self_link, @@ -262,8 +262,8 @@ module "vm-spoke-1" { module "vm-spoke-2" { source = "../../modules/compute-vm" project_id = var.project_id - region = module.vpc-spoke-2.subnet_regions["${var.regions.b}/spoke-2-b"] - zone = "${module.vpc-spoke-2.subnet_regions["${var.regions.b}/spoke-2-b"]}-b" + region = var.regions.b + zone = "${var.regions.b}-b" name = "spoke-2-test" network_interfaces = [{ network = module.vpc-spoke-2.self_link, diff --git a/infrastructure/onprem-google-access-dns/main.tf b/infrastructure/onprem-google-access-dns/main.tf index 29d935bce..a1885adef 100644 --- a/infrastructure/onprem-google-access-dns/main.tf +++ b/infrastructure/onprem-google-access-dns/main.tf @@ -105,7 +105,7 @@ module "vpn" { module "nat" { source = "../../modules/net-cloudnat" project_id = var.project_id - region = module.vpc.subnet_regions["${var.region}/subnet"] + region = var.region name = "default" router_create = false router_name = module.vpn.router_name @@ -184,8 +184,8 @@ module "service-account-gce" { module "vm-test" { source = "../../modules/compute-vm" project_id = var.project_id - region = module.vpc.subnet_regions["${var.region}/subnet"] - zone = "${module.vpc.subnet_regions["${var.region}/subnet"]}-b" + region = var.region + zone = "${var.region}-b" name = "test" network_interfaces = [{ network = module.vpc.self_link, diff --git a/infrastructure/shared-vpc-gke/main.tf b/infrastructure/shared-vpc-gke/main.tf index 09121c987..1c8d01bdf 100644 --- a/infrastructure/shared-vpc-gke/main.tf +++ b/infrastructure/shared-vpc-gke/main.tf @@ -178,8 +178,8 @@ module "host-dns" { module "vm-bastion" { source = "../../modules/compute-vm" project_id = module.project-svc-gce.project_id - region = module.vpc-shared.subnet_regions["${var.region}/gce"] - zone = "${module.vpc-shared.subnet_regions["${var.region}/gce"]}-b" + region = var.region + zone = "${var.region}-b" name = "bastion" network_interfaces = [{ network = module.vpc-shared.self_link, @@ -207,7 +207,7 @@ module "cluster-1" { source = "../../modules/gke-cluster" name = "cluster-1" project_id = module.project-svc-gke.project_id - location = "${module.vpc-shared.subnet_regions["${var.region}/gke"]}-b" + location = "${var.region}-b" network = module.vpc-shared.self_link subnetwork = module.vpc-shared.subnet_self_links["${var.region}/gke"] secondary_range_pods = "pods"