From 659e73ec82a883fa7dee90102969e7c49318ecab Mon Sep 17 00:00:00 2001
From: Jesus Perez Rey <jprey@bluemetrix.com>
Date: Fri, 4 Nov 2022 15:51:11 +0100
Subject: [PATCH] Add support to choosing the GCP subnet to deploy to.

Signed-off-by: Jesus Perez Rey <jprey@bluemetrix.com>
---
 roles/common/defaults/main.yml         | 1 +
 roles/platform/defaults/main.yml       | 1 +
 roles/platform/tasks/setup_gcp_env.yml | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 171ffcc9..8f8c6f52 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -136,6 +136,7 @@ common__azure_netapp_nfs_version:         "{{ infra.azure.netapp.nfs.version | d
 # GCP Infra
 common__gcp_project:                      "{{ infra.gcp.project | default('gcp-se') }}"
 common__gcp_region:                       "{{ infra.gcp.region | default('europe-west1') }}"
+common__gcp_subnet_id:                    "{{ infra.gcp.vpc.subnet_id | default(None) }}"
 
 # Plat
 common__xaccount_credential_suffix:       "{{ env.cdp.credential.suffix | default(common__xaccount_suffix) }}"
diff --git a/roles/platform/defaults/main.yml b/roles/platform/defaults/main.yml
index b9d32cf7..063670dc 100644
--- a/roles/platform/defaults/main.yml
+++ b/roles/platform/defaults/main.yml
@@ -145,6 +145,7 @@ plat__aws_policy_urls:                        "{{ plat__aws_policy_urls_default
 
 # GCP
 plat__gcp_project:                            "{{ common__gcp_project }}"
+plat__gcp_subnet_id:                          "{{ common__gcp_subnet_id }}"
 
 plat__gcp_role_suffix:                        "{{ env.gcp.role.suffix | default(common__role_suffix) }}"
 plat__gcp_storage_suffix:                     "{{ env.gcp.storage.suffix | default(common__storage_suffix) }}"
diff --git a/roles/platform/tasks/setup_gcp_env.yml b/roles/platform/tasks/setup_gcp_env.yml
index fcf799e1..bb2c9881 100644
--- a/roles/platform/tasks/setup_gcp_env.yml
+++ b/roles/platform/tasks/setup_gcp_env.yml
@@ -27,7 +27,7 @@
     log_identity: "{{ plat__gcp_log_identity_name }}@{{ plat__gcp_project }}.iam.gserviceaccount.com"
     vpc_id: "{{ plat__vpc_name }}"
     subnet_ids:
-      - "{{ plat__gcp_subnets_discovered[0].name }}"  # TODO - Check in validation_gcp.yml -- CDP on GCP only supports a single subnet deployment
+      - "{{ plat__gcp_subnet_id if plat__gcp_subnet_id else plat__gcp_subnets_discovered[0].name }}"  # TODO - Check in validation_gcp.yml -- CDP on GCP only supports a single subnet deployment
     project: "{{ plat__gcp_project }}"
     tunnel: "{{ plat__tunnel }}"
     workload_analytics: "{{ plat__workload_analytics }}"