Merge branch 'R-22-6-0' into 'main'

R-22-6-0 See merge request cloudsolutions/automation-templates/f5-azure-arm-templates-v2!136
F5Networks · Feb 27, 2023 · 15b9758 · 15b9758
2 parents b5fceeb + f011cb8
commit 15b9758
Show file tree

Hide file tree

Showing 231 changed files with 4,272 additions and 627 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ run_smoke_tests: run_crawler
 
 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.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run --cloud azure
+	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.0/dist/f5-bigip-runtime-init-1.6.0-1.gz.run --cloud azure
 
 run_parameter_generator:
 	echo "Generating v2 input parameters files"

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-# F5 Azure ARM Templates
+# F5 BIG-IP Azure ARM Templates
 
 [![Releases](https://img.shields.io/github/release/f5networks/f5-azure-arm-templates-v2.svg)](https://github.com/f5networks/f5-azure-arm-templates-v2/releases)
 [![Issues](https://img.shields.io/github/issues/f5networks/f5-azure-arm-templates-v2.svg)](https://github.com/f5networks/f5-azure-arm-templates-v2/issues)
 
-## F5 Azure ARM Templates 2.0
+## F5 BIG-IP Azure ARM Templates 2.0
 
 
 ## Introduction
@@ -39,7 +39,7 @@ If you find an issue, we would love to hear about it.
 
 ### Copyright
 
-Copyright 2014-2022 F5 Networks Inc.
+Copyright 2014-2023 F5 Networks Inc.
 
 ### License
 

diff --git a/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml b/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/existing/demo.yaml
@@ -7,7 +7,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: bigiq
 NIC COUNT: 1

diff --git a/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml b/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/existing/prod.yaml
@@ -8,7 +8,7 @@ BIGIQ ADDRESS: <RESOURCE GROUP>-bigiq.<REGION>.cloudapp.azure.com
 BIGIQ TENANT: myTenant
 CREATE WORKSPACE: false
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: bigiq
 NIC COUNT: 1

diff --git a/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml b/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/demo_app.yaml
@@ -10,7 +10,7 @@ BIGIQ ADDRESS: <RESOURCE GROUP>-bigiq.<REGION>.cloudapp.azure.com
 BIGIQ TENANT: myTenant
 CREATE WORKSPACE: false
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: bigiq
 PROVISION EXTERNAL LB: true

diff --git a/...st-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/demo_app_v14.yaml b/...st-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/demo_app_v14.yaml
@@ -10,7 +10,7 @@ BIGIQ ADDRESS: <RESOURCE GROUP>-bigiq.<REGION>.cloudapp.azure.com
 BIGIQ TENANT: myTenant
 CREATE WORKSPACE: false
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: bigiq
 PROVISION EXTERNAL LB: true

diff --git a/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml b/...d-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/bigiq/full/prod_app.yaml
@@ -10,7 +10,7 @@ BIGIQ ADDRESS: <RESOURCE GROUP>-bigiq.<REGION>.cloudapp.azure.com
 BIGIQ TENANT: myTenant
 CREATE WORKSPACE: false
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: bigiq
 PROVISION EXTERNAL LB: true

diff --git a/...est-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/defaults.yaml b/...est-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/defaults.yaml
@@ -7,7 +7,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 NIC COUNT: 1

diff --git a/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/demo.yaml b/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/demo.yaml
@@ -7,7 +7,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 NIC COUNT: 1

diff --git a/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/prod.yaml b/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/existing/prod.yaml
@@ -8,7 +8,7 @@ BIGIQ ADDRESS: <RESOURCE GROUP>-bigiq.<REGION>.cloudapp.azure.com
 BIGIQ TENANT: myTenant
 CREATE WORKSPACE: false
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 NIC COUNT: 1

diff --git a/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/defaults.yaml b/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/defaults.yaml
@@ -7,7 +7,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 PROVISION EXTERNAL LB: true

diff --git a/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/demo_app.yaml b/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/demo_app.yaml
@@ -9,13 +9,13 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 PROVISION EXTERNAL LB: true
 PROVISION INTERNAL LB: true
 PROVISION PUBLIC IP: true
-REGION: eastus
+REGION: westus2
 RESOURCE GROUP: dd-auto-<DEWPOINT JOB ID>
 RESTRICTED SRC ADDRESS: '*'
 RESTRICTED SRC ADDRESS APP: '*'

diff --git a/...est-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/demo_app_v14.yaml b/...est-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/demo_app_v14.yaml
@@ -9,7 +9,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:14.1.502000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:14.1.503000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 PROVISION EXTERNAL LB: true

diff --git a/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/prod_app.yaml b/...ed-test-scripts/data/f5-azure-arm-templates-v2/examples/autoscale/payg/full/prod_app.yaml
@@ -9,7 +9,7 @@ ARTIFACT LOCATION: 'templates/'
 BIGIQ TENANT: <RESOURCE GROUP>-vmss
 CREATE WORKSPACE: true
 DISAGGREGATOR: LB
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 INSTANCE TYPE: Standard_D2s_v4
 LICENSE TYPE: payg
 PROVISION EXTERNAL LB: false

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/demo.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/demo.yaml
@@ -5,12 +5,15 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: false
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: true
 REGION: eastus

diff --git a/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/demo_app.yaml b/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/demo_app.yaml
@@ -5,9 +5,12 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: false
+CREATE SECRET: false
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/prod.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/prod.yaml
@@ -5,12 +5,15 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: false
+CREATE SECRET: false
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: false
 REGION: eastus2

diff --git a/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/prod_app.yaml b/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/existing/prod_app.yaml
@@ -5,9 +5,12 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: true
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/demo.yaml b/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/demo.yaml
@@ -5,11 +5,14 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: false
+CREATE SECRET: false
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: true
 REGION: eastus

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/demo_app.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/demo_app.yaml
@@ -5,8 +5,11 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: false
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/prod.yaml b/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/prod.yaml
@@ -5,11 +5,14 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: false
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: false
 REGION: eastus2

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/prod_app.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/byol/full/prod_app.yaml
@@ -5,8 +5,11 @@ ARTIFACT LOCATION: 'templates/'
 AUTOFILL EVAL LICENSE KEY: ''
 AUTOFILL EVAL LICENSE KEY 2: ''
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: true
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.302000
+IMAGE: f5-networks:f5-big-ip-byol:f5-big-all-2slot-byol:16.1.303000
 LICENSE TYPE: byol
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/defaults.yaml b/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/defaults.yaml
@@ -3,8 +3,9 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+CREATE SECRET: true
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/demo.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/demo.yaml
@@ -3,12 +3,15 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: true
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: true
 REGION: eastus2

diff --git a/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/demo_app.yaml b/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/demo_app.yaml
@@ -3,15 +3,18 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: false
+CREATE SECRET: false
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
 NIC COUNT: 3
 PROVISION APP: true
 PROVISION PUBLIC IP: true
-REGION: eastus2
+REGION: westus2
 RESOURCE GROUP: dd-failover-<DEWPOINT JOB ID>
 RESTRICTED SRC ADDRESS: '*'
 RESTRICTED SRC ADDRESS APP: '*'

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/prod.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/prod.yaml
@@ -3,12 +3,15 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: false
 EXT VIP ADDRESS: ''
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: false
 REGION: eastus2

diff --git a/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/prod_app.yaml b/...test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/existing/prod_app.yaml
@@ -3,9 +3,12 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: false
+CREATE SECRET: false
 EXT VIP ADDRESS: 10.0.1.101
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/defaults.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/defaults.yaml
@@ -3,8 +3,9 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+CREATE SECRET: true
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
 NIC COUNT: 3

diff --git a/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/demo.yaml b/automated-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/demo.yaml
@@ -3,11 +3,14 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: false
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
-NIC COUNT: 3
+NIC COUNT: 2
 PROVISION APP: false
 PROVISION PUBLIC IP: true
 REGION: eastus2

diff --git a/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/demo_app.yaml b/...ted-test-scripts/data/f5-azure-arm-templates-v2/examples/failover/payg/full/demo_app.yaml
@@ -3,14 +3,17 @@ ADMIN USERNAME: azureuser
 APP CONTAINER: 'f5devcentral/f5-demo-app:1.0.1'
 ARTIFACT LOCATION: 'templates/'
 CFE TAG: <RESOURCE GROUP>
+# if CREATE IDENTITY = false, then CREATE SECRET must also be false
+CREATE IDENTITY: true
+CREATE SECRET: true
 INSTANCE TYPE: Standard_D8s_v4
-IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.302000
+IMAGE: f5-networks:f5-big-ip-best:f5-big-best-plus-hourly-25mbps-po-f5:16.1.303000
 LICENSE TYPE: payg
 LOG LEVEL: debug
 NIC COUNT: 3
 PROVISION APP: true
 PROVISION PUBLIC IP: true
-REGION: eastus
+REGION: eastus2
 RESOURCE GROUP: dd-failover-<DEWPOINT JOB ID>
 RESTRICTED SRC ADDRESS: '*'
 RESTRICTED SRC ADDRESS APP: '*'