From 4c64c1587159b319527de1a7f2b70a92698e2100 Mon Sep 17 00:00:00 2001 From: Luca Prete Date: Mon, 28 Aug 2023 09:33:52 +0200 Subject: [PATCH] Revert "Remove unused ASN numbers from CloudNAT to avoid provider errors" (#1626) This reverts commit 311bed8e83de55d2d80fd7c2c26477d922584a19. --- fast/stages/2-networking-a-peering/landing.tf | 1 + fast/stages/2-networking-a-peering/spoke-dev.tf | 1 + fast/stages/2-networking-a-peering/spoke-prod.tf | 1 + fast/stages/2-networking-b-vpn/landing.tf | 1 + fast/stages/2-networking-b-vpn/spoke-dev.tf | 1 + fast/stages/2-networking-b-vpn/spoke-prod.tf | 1 + fast/stages/2-networking-c-nva/landing.tf | 2 ++ fast/stages/2-networking-d-separate-envs/spoke-dev.tf | 1 + fast/stages/2-networking-d-separate-envs/spoke-prod.tf | 1 + fast/stages/2-networking-e-nva-bgp/landing.tf | 2 ++ 10 files changed, 12 insertions(+) diff --git a/fast/stages/2-networking-a-peering/landing.tf b/fast/stages/2-networking-a-peering/landing.tf index 013c6e86..db40b3f1 100644 --- a/fast/stages/2-networking-a-peering/landing.tf +++ b/fast/stages/2-networking-a-peering/landing.tf @@ -84,4 +84,5 @@ module "landing-nat-primary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.primary]}" router_network = module.landing-vpc.name + router_asn = 4200001024 } diff --git a/fast/stages/2-networking-a-peering/spoke-dev.tf b/fast/stages/2-networking-a-peering/spoke-dev.tf index 838ba6a4..2256926f 100644 --- a/fast/stages/2-networking-a-peering/spoke-dev.tf +++ b/fast/stages/2-networking-a-peering/spoke-dev.tf @@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" { name = "dev-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.dev-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-a-peering/spoke-prod.tf b/fast/stages/2-networking-a-peering/spoke-prod.tf index 7569647e..b7e3abcb 100644 --- a/fast/stages/2-networking-a-peering/spoke-prod.tf +++ b/fast/stages/2-networking-a-peering/spoke-prod.tf @@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" { name = "prod-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.prod-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-b-vpn/landing.tf b/fast/stages/2-networking-b-vpn/landing.tf index 013c6e86..db40b3f1 100644 --- a/fast/stages/2-networking-b-vpn/landing.tf +++ b/fast/stages/2-networking-b-vpn/landing.tf @@ -84,4 +84,5 @@ module "landing-nat-primary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.primary]}" router_network = module.landing-vpc.name + router_asn = 4200001024 } diff --git a/fast/stages/2-networking-b-vpn/spoke-dev.tf b/fast/stages/2-networking-b-vpn/spoke-dev.tf index 838ba6a4..2256926f 100644 --- a/fast/stages/2-networking-b-vpn/spoke-dev.tf +++ b/fast/stages/2-networking-b-vpn/spoke-dev.tf @@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" { name = "dev-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.dev-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-b-vpn/spoke-prod.tf b/fast/stages/2-networking-b-vpn/spoke-prod.tf index 7569647e..b7e3abcb 100644 --- a/fast/stages/2-networking-b-vpn/spoke-prod.tf +++ b/fast/stages/2-networking-b-vpn/spoke-prod.tf @@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" { name = "prod-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.prod-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-c-nva/landing.tf b/fast/stages/2-networking-c-nva/landing.tf index e7329a43..75cb9e81 100644 --- a/fast/stages/2-networking-c-nva/landing.tf +++ b/fast/stages/2-networking-c-nva/landing.tf @@ -85,6 +85,7 @@ module "landing-nat-primary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.primary]}" router_network = module.landing-untrusted-vpc.name + router_asn = 4200001024 } moved { @@ -100,6 +101,7 @@ module "landing-nat-secondary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.secondary]}" router_network = module.landing-untrusted-vpc.name + router_asn = 4200001024 } # Trusted VPC diff --git a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf index b5b485be..fd15e26c 100644 --- a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf +++ b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf @@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" { name = "dev-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.dev-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf index bf43728d..c8d8a69c 100644 --- a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf +++ b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf @@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" { name = "prod-nat-${local.region_shortnames[each.value]}" router_create = true router_network = module.prod-spoke-vpc.name + router_asn = 4200001024 logging_filter = "ERRORS_ONLY" } diff --git a/fast/stages/2-networking-e-nva-bgp/landing.tf b/fast/stages/2-networking-e-nva-bgp/landing.tf index ab6c94eb..434adb85 100644 --- a/fast/stages/2-networking-e-nva-bgp/landing.tf +++ b/fast/stages/2-networking-e-nva-bgp/landing.tf @@ -86,6 +86,7 @@ module "landing-nat-primary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.primary]}" router_network = module.landing-untrusted-vpc.name + router_asn = 4200001024 } moved { @@ -101,6 +102,7 @@ module "landing-nat-secondary" { router_create = true router_name = "prod-nat-${local.region_shortnames[var.regions.secondary]}" router_network = module.landing-untrusted-vpc.name + router_asn = 4200001024 } # Trusted VPC