Align locations in networking stage with other stages (#3559)

2025-12-04 14:28:05 +07:00
parent 6f8097d2eb
commit 33df0bba4a
9 changed files with 107 additions and 107 deletions
--- a/fast/stages/2-networking/datasets/hub-and-spokes-ncc/defaults.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-ncc/defaults.yaml
@@ -26,8 +26,8 @@ context:
      - 172.16.0.0/12
      - 192.168.0.0/16
  locations:
-    primary: europe-west8
-    secondary: europe-west12
+    primary: europe-west1
+    secondary: europe-west3
  iam_principals: {}
 projects:
  defaults:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-nva/defaults.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-nva/defaults.yaml
@@ -26,8 +26,8 @@ context:
      - 172.16.0.0/12
      - 192.168.0.0/16
  locations:
-    primary: europe-west8
-    secondary: europe-west12
+    primary: europe-west1
+    secondary: europe-west3
  iam_principals: {}
 projects:
  defaults:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-nva/nvas/main.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-nva/nvas/main.yaml
@@ -6,7 +6,7 @@

 project_id: $project_ids:net-core-0
 name: main
-region: europe-west8
+region: europe-west1

 auto_instance_config:
  image: projects/cos-cloud/global/images/family/cos-stable
@@ -16,7 +16,7 @@ auto_instance_config:
    - test
  nics:
    - network: $networks:dmz
-      subnet: $subnets:dmz/europe-west8/dmz-default
+      subnet: $subnets:dmz/europe-west1/dmz-default
      routes:
        - 10.74.0.0/16
      masquerade:
@@ -24,15 +24,15 @@ auto_instance_config:
        # default route via this NIC.
        true
    - network: $networks:hub
-      subnet: $subnets:hub/europe-west8/hub-default
+      subnet: $subnets:hub/europe-west1/hub-default
      routes:
        - 10.71.0.0/16
    - network: $networks:prod
-      subnet: $subnets:prod/europe-west8/prod-default
+      subnet: $subnets:prod/europe-west1/prod-default
      routes:
        - 10.72.0.0/16
    - network: $networks:dev
-      subnet: $subnets:dev/europe-west8/dev-default
+      subnet: $subnets:dev/europe-west1/dev-default
      routes:
        - 10.73.0.0/16

@@ -51,10 +51,10 @@ ilb_config:
      auto_create_instances: 2
  forwarding_rules:
    - network: $networks:dmz
-      subnet: $subnets:dmz/europe-west8/dmz-default
+      subnet: $subnets:dmz/europe-west1/dmz-default
    - network: $networks:hub
-      subnet: $subnets:hub/europe-west8/hub-default
+      subnet: $subnets:hub/europe-west1/hub-default
    - network: $networks:prod
-      subnet: $subnets:prod/europe-west8/prod-default
+      subnet: $subnets:prod/europe-west1/prod-default
    - network: $networks:dev
-      subnet: $subnets:dev/europe-west8/dev-default
+      subnet: $subnets:dev/europe-west1/dev-default
--- a/fast/stages/2-networking/datasets/hub-and-spokes-nva/vpcs/dmz/.config.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-nva/vpcs/dmz/.config.yaml
@@ -19,7 +19,7 @@ routers:
        "192.168.0.0/16": "rfc1918-192"
 nat_config:
  nat-ew8:
-    region: europe-west8
+    region: europe-west1
 routes:
  rfc1918-10:
    dest_range: "10.0.0.0/8"
--- a/fast/stages/2-networking/datasets/hub-and-spokes-peerings/defaults.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-peerings/defaults.yaml
@@ -26,8 +26,8 @@ context:
      - 172.16.0.0/12
      - 192.168.0.0/16
  locations:
-    primary: europe-west8
-    secondary: europe-west12
+    primary: europe-west1
+    secondary: europe-west3
  iam_principals: {}
 projects:
  defaults:
--- a/fast/stages/2-networking/datasets/hub-and-spokes-vpns/defaults.yaml
+++ b/fast/stages/2-networking/datasets/hub-and-spokes-vpns/defaults.yaml
@@ -26,8 +26,8 @@ context:
      - 172.16.0.0/12
      - 192.168.0.0/16
  locations:
-    primary: europe-west8
-    secondary: europe-west12
+    primary: europe-west1
+    secondary: europe-west3
  iam_principals: {}
 projects:
  defaults: