зеркало из https://github.com/Azure/aks-engine.git
checking in apiVersionStorageManagedDisks change from cr
This commit is contained in:
Родитель
8e4f1b4928
Коммит
9bea932f50
|
@ -56,7 +56,7 @@
|
|||
},
|
||||
{{if .IsManagedDisks}}
|
||||
{
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
"location": "[resourceGroup().location]",
|
||||
"name": "[variables('{{.Name}}AvailabilitySet')]",
|
||||
"properties": {
|
||||
|
@ -158,7 +158,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"apiVersionDefault": "2016-03-30",
|
||||
"apiVersionStorage": "2015-06-15",
|
||||
{{if .HasManagedDisks}}
|
||||
"apiManagedDisksVersion": "2016-04-30-preview",
|
||||
"apiVersionStorageManagedDisks": "2016-04-30-preview",
|
||||
{{end}}
|
||||
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
|
||||
"masterCount": {{.MasterProfile.Count}},
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
},
|
||||
{{if .IsManagedDisks}}
|
||||
{
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
"location": "[resourceGroup().location]",
|
||||
"name": "[variables('{{.Name}}AvailabilitySet')]",
|
||||
"properties": {
|
||||
|
@ -140,7 +140,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"apiVersionDefault": "2016-03-30",
|
||||
"apiVersionStorage": "2015-06-15",
|
||||
{{if .HasManagedDisks}}
|
||||
"apiManagedDisksVersion": "2016-04-30-preview",
|
||||
"apiVersionStorageManagedDisks": "2016-04-30-preview",
|
||||
{{end}}
|
||||
"agentCustomScript": "[concat('/usr/bin/nohup /bin/bash -c \"/bin/bash /opt/azure/containers/configure-swarm-cluster.sh ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1 &\" &')]",
|
||||
"agentRunCmd": "[concat('runcmd:\n - [ /bin/bash, /opt/azure/containers/install-cluster.sh ]\n\n')]",
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
},
|
||||
{{if .IsManagedDisks}}
|
||||
{
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
"location": "[resourceGroup().location]",
|
||||
"name": "[variables('{{.Name}}AvailabilitySet')]",
|
||||
"properties": {
|
||||
|
@ -158,7 +158,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
{{end}}
|
||||
{
|
||||
{{if .IsManagedDisks}}
|
||||
"apiVersion": "[variables('apiManagedDisksVersion')]",
|
||||
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
|
||||
{{else}}
|
||||
"apiVersion": "[variables('apiVersionDefault')]",
|
||||
{{end}}
|
||||
|
|
Загрузка…
Ссылка в новой задаче