Update mainTemplate.json

40net-cloud · Oct 25, 2024 · 9a0a785 · 9a0a785
1 parent 9d3298d
commit 9a0a785
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/FortiADC/A-Single-VM/mainTemplate.json b/FortiADC/A-Single-VM/mainTemplate.json
@@ -322,13 +322,14 @@
     "vnetName": "[if(equals(parameters('vnetName'),''),concat(parameters('FortiADCNamePrefix'),'-vnet'),parameters('vnetName'))]",
     "subnet1Id": "[if(equals(parameters('vnetNewOrExisting'),'new'),resourceId('Microsoft.Network/virtualNetworks/subnets', variables('vnetName'),parameters('subnet1Name')),resourceId(parameters('vnetResourceGroup'),'Microsoft.Network/virtualNetworks/subnets', variables('vnetName'),parameters('subnet1Name')))]",
     "subnet2Id": "[if(equals(parameters('vnetNewOrExisting'),'new'),resourceId('Microsoft.Network/virtualNetworks/subnets', variables('vnetName'),parameters('subnet2Name')),resourceId(parameters('vnetResourceGroup'),'Microsoft.Network/virtualNetworks/subnets', variables('vnetName'),parameters('subnet2Name')))]",
-	"customDataHeader": "Content-Type: multipart/mixed; boundary=\"12345\"\nMIME-Version: 1.0\n\n--12345\nContent-Type: text/plain; charset=\"us-ascii\"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nContent-Disposition: attachment; filename=\"config\"\n\n",
-    "customDataBody": "[concat('config system global', '\n', ' set hostname ', variables('fadVmName'), '\nend\n', parameters('FortiADCAdditionalCustomData'),variables('customDataFortiFlex'),'\n')]",
-    "customDataLicenseHeader": "--12345\nContent-Type: text/plain; charset=\"us-ascii\"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nContent-Disposition: attachment; filename=\"fadlicense\"\n\n",
-    "customDataFooter": "\n--12345--\n",
-    "customDataFortiFlex": "[if(equals(parameters('FortiADCLicenseFortiFlex'),''),'',concat('execute vm-license ',parameters('FortiADCLicenseFortiFlex'), '\n'))]",
-    "customDataCombined": "[concat(variables('customDataHeader'),variables('customDataBody'),variables('customDataFortiFlex'),variables('customDataLicenseHeader'),parameters('FortiADCLicenseBYOL'), variables('customDataFooter'))]",
-    "fadCustomData": "[base64(if(equals(parameters('FortiADCLicenseBYOL'),''),variables('customDataBody'),variables('customDataCombined')))]",
+	"customDataCombined": {
+      "storage-account":"",
+	  "container":"",
+	  "config": "[parameters('FortiADCAdditionalCustomData')]",
+      "license": "[parameters('FortiADCLicenseBYOL')]",
+      "flex_token": "[parameters('FortiADCLicenseFortiFlex')]"
+    },
+    "fadCustomData": "[base64(string(variables('customDataCombined')))]",
     "fadVmName": "[concat(parameters('FortiADCNamePrefix'),'-fad')]",
     "fadNic1Name": "[concat(variables('fadVmName'),'-nic1')]",
     "fadNic1Id": "[resourceId('Microsoft.Network/networkInterfaces',variables('fadNic1Name'))]",