From 9a0a78527390854c5db9c7ced4125b3bc9140990 Mon Sep 17 00:00:00 2001 From: yarafe Date: Fri, 25 Oct 2024 14:54:41 +0200 Subject: [PATCH] Update mainTemplate.json --- FortiADC/A-Single-VM/mainTemplate.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/FortiADC/A-Single-VM/mainTemplate.json b/FortiADC/A-Single-VM/mainTemplate.json index d37af6ab..669389eb 100644 --- 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'))]",