Add changes for GCP L2 deployment

Co-authored-by: Jeremy Wietrzykowski <[email protected]>
Co-authored-by: Jim Enright <[email protected]>
Signed-off-by: Jim Enright <[email protected]>

Author: jimright

roles/infrastructure/defaults/main.yml

@@ -134,9 +134,12 @@ infra__gcp_project:                 "{{ common__gcp_project }}"
 infra__gcp_storage_location_data:   "{{ infra.gcp.storage.path.data | default([infra__storage_name, infra__data_path] | join('-')) }}"
 infra__gcp_storage_location_logs:   "{{ infra.gcp.storage.path.logs | default([infra__storage_name, infra__logs_path] | join('-')) }}"
 
-infra__gcp_cloud_router_name:       "{{ infra.gcp.network.router.name | default([infra__namespace, 'router'] | join('-')) }}"
-infra__gcp_cloud_router_asn:        "{{ infra.gcp.network.router.asn | default(64514) }}"
-infra__gcp_cloud_nat_name:          "{{ infra.gcp.network.nat.name | default([infra__namespace, 'nat'] | join('-')) }}"
+infra__gcp_cloud_router_name_suffix:  "{{ infra.gcp.network.router.name_suffix | default('router') }}"
+infra__gcp_cloud_router_name:         "{{ infra.gcp.network.router.name | default([infra__namespace, infra__gcp_cloud_router_name_suffix] | join('-')) }}"
+infra__gcp_cloud_router_asn:          "{{ infra.gcp.network.router.asn | default(64514) }}"
+
+infra__gcp_cloud_nat_name_suffix:   "{{ infra.gcp.network.nat.name_suffix | default('nat') }}"
+infra__gcp_cloud_nat_name:          "{{ infra.gcp.network.nat.name | default([infra__namespace, infra__gcp_cloud_nat_name_suffix] | join('-')) }}"
 
 # Azure
 infra__azure_metagroup_name:        "{{ common__azure_metagroup_name }}"