From fb88c99c8b2fb8972019f7a8488d876532088717 Mon Sep 17 00:00:00 2001 From: slguo Date: Wed, 4 Jan 2023 16:10:21 -0800 Subject: [PATCH] 1. fix wording in mantis 0871796 2. Add flxexVm license support in template for azure by IFan Change-Id: I4bfb445f5d985a73000d9b5608ea3f616740d95c --- azure/templates/azure_bootstrap.json | 5 +++++ azure/templates/deploy_fwb_ha.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/azure/templates/azure_bootstrap.json b/azure/templates/azure_bootstrap.json index 8e2739c..b36378d 100644 --- a/azure/templates/azure_bootstrap.json +++ b/azure/templates/azure_bootstrap.json @@ -144,6 +144,10 @@ "type": "string", "defaultValue": "config system global\n set timezone 02\n end" }, + "flxexVm": { + "type": "string", + "defaultValue": "" + }, "usrCLIUri": { "type": "string", "defaultValue": "https://fwbsctesthdhsc.blob.core.windows.net/cloudinitdtest/usr-cli-file.txt?st=2019-08-21T06%3A48%3A00Z&se=2019-08-23T06%3A48%3A29Z&sp=rl&sv=2018-03-28&sr=b&sig=KyqXzuKrw36eqflsAKXuWX9QZh0SCT%2BkayGsAe4mo9I%3D" @@ -161,6 +165,7 @@ "usrCLI": "[concat(',\"usr-cli\": \"', parameters('usrCLI'), '\"')]", "usrCLIUri": "[concat(',\"usr-cli-uri\": \"', parameters('usrCLIUri'), '\"')]", "usrLicenseUri": "[concat(',\"usr-license-uri\": \"', parameters('usrLicenseUri'), '\"')]", + "flxexVm": "[concat(',\"flex_token\": \"', parameters('flxexVm'), '\"')]", "customData": "[concat('{', variables('cloudInitd'), variables('usrCLI'), variables('usrCLIUri'), variables('usrLicenseUri'), '}')]" }, "resources": [ diff --git a/azure/templates/deploy_fwb_ha.json b/azure/templates/deploy_fwb_ha.json index 4514f93..91e827d 100755 --- a/azure/templates/deploy_fwb_ha.json +++ b/azure/templates/deploy_fwb_ha.json @@ -55,7 +55,7 @@ ], "defaultValue": "Availability Set", "metadata": { - "description": "Deploy FortiGate VMs in an Availability Set or Availability Zones. If Availability Zones deployment is selected but the location does not support Availability Zones an Availability Set will be deployed. If Availability Zones deployment is selected and Availability Zones are available in the location, FortiGate A will be placed in Zone 1, FortiGate B will be placed in Zone 2" + "description": "Deploy FortiWeb VMs in an Availability Set or Availability Zones. If Availability Zones deployment is selected but the location does not support Availability Zones an Availability Set will be deployed. If Availability Zones deployment is selected and Availability Zones are available in the location, FortiWeb A will be placed in Zone 1, FortiWeb B will be placed in Zone 2" } }, "acceleratedNetworking": {