Merge branch 'release-23-2-0' into 'main'

release-23-2-0 See merge request cloudsolutions/automation-templates/f5-google-gdm-templates-v2!134
F5Networks · Aug 17, 2023 · 77de6f7 · 77de6f7
2 parents 0b9f759 + f149d48
commit 77de6f7
Show file tree

Hide file tree

Showing 115 changed files with 451 additions and 445 deletions.
diff --git a/Makefile b/Makefile
@@ -66,4 +66,4 @@ run_expected_outputs_diff:
 
 run_sync_at_metadata:
 	echo "Syncing AT component metadata"
-	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.1/dist/f5-bigip-runtime-init-1.6.1-1.gz.run --cloud gcp
+	cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.6.2/dist/f5-bigip-runtime-init-1.6.2-1.gz.run --cloud gcp
diff --git a/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml b/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo.yaml
@@ -29,7 +29,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 2
 LICENSE TYPE: byol
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: true
 PROVISION DEMO APP: false
 REGION: us-west1

diff --git a/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml b/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/demo_app.yaml
@@ -29,7 +29,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 3
 LICENSE TYPE: byol
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: true
 PROVISION DEMO APP: true
 REGION: us-west1

diff --git a/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml b/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod.yaml
@@ -29,7 +29,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 3
 LICENSE TYPE: byol
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: false
 PROVISION DEMO APP: false
 REGION: us-central1

diff --git a/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml b/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/existing/prod_app.yaml
@@ -29,7 +29,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 2
 LICENSE TYPE: byol
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: false
 PROVISION DEMO APP: true
 REGION: us-central1

diff --git a/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml b/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo.yaml
@@ -27,7 +27,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 2
 LICENSE TYPE: payg
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: true
 PROVISION DEMO APP: false

diff --git a/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml b/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/demo_app.yaml
@@ -27,7 +27,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 3
 LICENSE TYPE: payg
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: true
 PROVISION DEMO APP: true

diff --git a/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml b/...ed-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod.yaml
@@ -27,7 +27,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 3
 LICENSE TYPE: payg
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: false
 PROVISION DEMO APP: false
 REGION: us-east1

diff --git a/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml b/...est-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/existing/prod_app.yaml
@@ -27,7 +27,7 @@ NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
 NUMBER NETWORKS: 3
 NUMBER NICS: 3
 LICENSE TYPE: payg
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PROVISION PUBLIC IP: false
 PROVISION DEMO APP: true
 REGION: us-east1

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/postpub_parameters.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/postpub_parameters.yaml
@@ -20,7 +20,7 @@ NUM FORWARDING RULES: 0
 NUM INTERNAL FORWARDING RULES: 0
 NUMBER NETWORKS: 2
 NUMBER NICS: 1
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: false
 REGION: us-west1

diff --git a/...scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/postpub_parameters1.yaml b/...scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/postpub_parameters1.yaml
@@ -20,7 +20,7 @@ NUM FORWARDING RULES: 0
 NUM INTERNAL FORWARDING RULES: 0
 NUMBER NETWORKS: 2
 NUMBER NICS: 1
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: false
 REGION: us-west1

diff --git a/...t-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/prepub_parameters.yaml b/...t-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/prepub_parameters.yaml
@@ -20,7 +20,7 @@ NUM FORWARDING RULES: 0
 NUM INTERNAL FORWARDING RULES: 0
 NUMBER NETWORKS: 2
 NUMBER NICS: 1
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: false
 REGION: us-west1

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/prepub_parameters1.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/modules/bastion/prepub_parameters1.yaml
@@ -20,7 +20,7 @@ NUM FORWARDING RULES: 0
 NUM INTERNAL FORWARDING RULES: 0
 NUMBER NETWORKS: 2
 NUMBER NICS: 1
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 PRIVATE IP GOOGLE ACCESS: ''
 PROVISION PUBLIC IP: false
 REGION: us-west1

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_2nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_3nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_2nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/demo_app_3nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_2nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_3nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_2nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/existing/prod_app_3nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...t-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml b/...t-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/defaults.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_2nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_3nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_2nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/demo_app_3nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_2nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml b/...-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_3nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_1nic.yaml
@@ -27,7 +27,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_2nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml b/...ipts/data/f5-google-gdm-templates-v2/examples/quickstart/payg/existing/prod_app_3nic.yaml
@@ -26,7 +26,7 @@ DAG STACK NAME: <UNIQUESTRING>-bastion-dag
 DAG TEMPLATE URL: 'file://$PWD/examples/modules/dag/dag.py'
 NETWORK STACK NAME: <UNIQUESTRING>-network
 NETWORK TEMPLATE URL: 'file://$PWD/examples/modules/network/network.py'
-OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-1804-lts
+OS IMAGE: projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts
 SECONDARY IP CIDR RANGE 1: ''
 SECONDARY RANGE NAME 1: ''
 PRIVATE IP GOOGLE ACCESS: ''

diff --git a/automated-test-scripts/data/test_policies/shimkus.yaml b/automated-test-scripts/data/test_policies/shimkus.yaml
@@ -13,7 +13,7 @@ google-autoscale-payg-example-test:
 google-autoscale-payg-existing-test:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/autoscale/payg_existing_network/daily_test.yaml"
   run: "random"
-  random-num-of-tests: 0
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/demo.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/autoscale/payg/existing/prod.yaml"
@@ -40,7 +40,7 @@ google-autoscale-bigiq-existing-test:
 google-gdm-failover-example-test-byol:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/failover/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/demo.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/byol/full/prod.yaml"
@@ -50,7 +50,7 @@ google-gdm-failover-example-test-byol:
 google-gdm-failover-example-test-payg:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/failover/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 2
+  random-num-of-tests: 1
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/demo.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/failover/payg/full/prod.yaml"
@@ -82,7 +82,7 @@ google-gdm-failover-existing-test-payg:
 google-gdm-quickstart-test-byol:
   test-url: "file://automated-test-scripts/f5-google-gdm-templates-v2/examples/quickstart/daily_test_full.yaml"
   run: "random"
-  random-num-of-tests: 1
+  random-num-of-tests: 0
   parameters-files:
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_1nic.yaml"
     - "automated-test-scripts/data/f5-google-gdm-templates-v2/examples/quickstart/byol/full/demo_app_2nic.yaml"

diff --git a/...ipts/f5-google-gdm-templates-v2/examples/failover/common/create_storage_upload_runtime.sh b/...ipts/f5-google-gdm-templates-v2/examples/failover/common/create_storage_upload_runtime.sh
@@ -17,12 +17,6 @@ else
     do_index=2
 fi
 
-# Update CFE tag
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<DEWPOINT JOB ID>\"" -i $PWD/examples/failover/bigip-configurations/<STACK NAME>-config.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<DEWPOINT JOB ID>\"" -i $PWD/examples/failover/bigip-configurations/<STACK NAME>-config.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.externalStorage.scopingTags.f5_cloud_failover_label = \"<DEWPOINT JOB ID>\"" -i $PWD/examples/failover/bigip-configurations/<STACK NAME>-config2.yaml
-/usr/bin/yq e ".extension_services.service_operations.[1].value.failoverAddresses.scopingTags.f5_cloud_failover_label = \"<DEWPOINT JOB ID>\"" -i $PWD/examples/failover/bigip-configurations/<STACK NAME>-config2.yaml
-
 # Uncomment this 2 debug
 # /usr/bin/yq e ".controls.logLevel = \"silly\"" -i $PWD/examples/failover/bigip-configurations/<STACK NAME>-config.yaml
 echo "Config 1:"

diff --git a/cloud-tools b/cloud-tools