зеркало из https://github.com/Azure/aks-engine.git
fixed bug in swarm generation
This commit is contained in:
Родитель
f83eeec092
Коммит
1ccb408fe8
|
@ -62,7 +62,7 @@ func prettyPrintJSON(content string) (string, error) {
|
|||
func prettyPrintArmTemplate(template string) (string, error) {
|
||||
translateParams := [][]string{
|
||||
{"parameters", "dparameters"},
|
||||
{"variables", "eparameters"},
|
||||
{"variables", "evariables"},
|
||||
{"resources", "fresources"},
|
||||
{"outputs", "zoutputs"},
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@
|
|||
"id": "[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
|
||||
}
|
||||
],
|
||||
"privateIPAddress": "[concat(split(variables('masterSubnet'),'0/24')[0], copyIndex(variables('masterFirstAddrOctet4')))]",
|
||||
"privateIPAddress": "[concat(variables('masterFirstAddrPrefix'), copyIndex(int(variables('masterFirstAddrOctet4'))))]",
|
||||
"privateIPAllocationMethod": "Static",
|
||||
"subnet": {
|
||||
"id": "[variables('masterSubnetRef')]"
|
||||
|
|
|
@ -20,6 +20,9 @@
|
|||
"masterStorageAccountName": "[concat(variables('storageAccountBaseName'), '0')]",
|
||||
"masterSubnetName": "[concat(variables('orchestratorName'), '-masterSubnet')]",
|
||||
"masterSubnetRef": "[concat(variables('vnetID'),'/subnets/',variables('masterSubnetName'))]",
|
||||
"masterFirstAddrOctets": "[split(parameters('firstConsecutiveStaticIP'),'.')]",
|
||||
"masterFirstAddrOctet4": "[variables('masterFirstAddrOctets')[3]]",
|
||||
"masterFirstAddrPrefix": "[concat(variables('masterFirstAddrOctets')[0],'.',variables('masterFirstAddrOctets')[1],'.',variables('masterFirstAddrOctets')[2],'.')]",
|
||||
"masterVMNamePrefix": "[concat(variables('orchestratorName'), '-master-', variables('nameSuffix'), '-')]",
|
||||
"masterVMSize": "[parameters('masterVMSize')]",
|
||||
"nameSuffix": "{{GetUniqueNameSuffix}}",
|
||||
|
|
Загрузка…
Ссылка в новой задаче