use cs.Location when available instead of resourceGroup().location (#379)

This commit is contained in:
Jingtao Ren 2017-03-15 13:34:10 -07:00 коммит произвёл GitHub
Родитель 9a4969b365
Коммит 2e16d1fb23
125 изменённых файлов: 7417 добавлений и 1100 удалений

1
.gitignore поставляемый
Просмотреть файл

@ -1,6 +1,7 @@
acs-engine.exe
acs-engine
_output/
_input/
.vscode
.DS_Store
test/user.env

Просмотреть файл

@ -47,7 +47,14 @@ func writeArtifacts(containerService *api.ContainerService, apiVersion, template
properties := &containerService.Properties
if properties.OrchestratorProfile.OrchestratorType == vlabs.Kubernetes {
directory := path.Join(artifactsDir, "kubeconfig")
for _, location := range acsengine.AzureLocations {
var locations []string
if containerService.Location != "" {
locations = []string{containerService.Location}
} else {
locations = acsengine.AzureLocations
}
for _, location := range locations {
b, gkcerr := acsengine.GenerateKubeConfig(properties, location)
if gkcerr != nil {
return gkcerr
@ -56,6 +63,7 @@ func writeArtifacts(containerService *api.ContainerService, apiVersion, template
return e
}
}
}
if e := saveFileString(artifactsDir, "ca.key", properties.CertificateProfile.GetCAPrivateKey()); e != nil {

Просмотреть файл

@ -1,6 +1,6 @@
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}NSGName')]",
"properties": {
"securityRules": [
@ -25,7 +25,7 @@
,"[variables('{{.Name}}LbID')]"
{{end}}
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
{{if .IsCustomVNET}}
@ -57,7 +57,7 @@
{{if .IsManagedDisks}}
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {
"platformFaultDomainCount": "3",
@ -76,7 +76,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -93,7 +93,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -103,7 +103,7 @@
{{end}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -112,7 +112,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -127,7 +127,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -180,7 +180,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
"availabilitySet": {

Просмотреть файл

@ -1,6 +1,6 @@
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}NSGName')]",
"properties": {
"securityRules": [
@ -19,7 +19,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -30,7 +30,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -45,7 +45,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -101,7 +101,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), '-vmss')]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {

Просмотреть файл

@ -3,7 +3,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -15,7 +15,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -28,7 +28,7 @@
"dependsOn": [
{{GetVNETSubnetDependencies}}
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -45,14 +45,14 @@
{{end}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -67,7 +67,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -97,7 +97,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -112,7 +112,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -148,7 +148,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -195,7 +195,7 @@
{
"creationSource" : "[concat('acsengine-', variables('masterVMNamePrefix'), copyIndex())]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -255,7 +255,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -74,8 +74,13 @@
"osImageSKU": "16.04.0-LTS",
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [ "0", "6", "c", "i", "o", "u", "1", "7", "d", "j", "p", "v", "2", "8", "e", "k", "q", "w", "3", "9", "f", "l", "r", "x", "4", "a", "g", "m", "s", "y", "5", "b", "h", "n", "t", "z" ],
"storageAccountPrefixesCount": "[length(variables('storageAccountPrefixes'))]",
"storageAccountType": "Standard_LRS",

Просмотреть файл

@ -184,7 +184,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')),'/cse', copyIndex(variables('{{.Name}}Offset')))]",
"properties": {

Просмотреть файл

@ -395,7 +395,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {

Просмотреть файл

@ -36,8 +36,13 @@
"apiVersionStorageManagedDisks": "2016-04-30-preview",
{{end}}
"location": "[resourceGroup().location]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location'),variables('orchestratorName')))]",
"masterStorageAccountName": "[concat(variables('storageAccountBaseName'), 'mstr0')]",
"nameSuffix": "[parameters('nameSuffix')]",
"orchestratorName": "k8s",
@ -50,7 +55,7 @@
"routeTableID": "[resourceId('Microsoft.Network/routeTables', variables('routeTableName'))]",
"sshNatPorts": [22,2201,2202,2203,2204],
"sshKeyPath": "[concat('/home/',variables('username'),'/.ssh/authorized_keys')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [ "0", "6", "c", "i", "o", "u", "1", "7", "d", "j", "p", "v", "2", "8", "e", "k", "q", "w", "3", "9", "f", "l", "r", "x", "4", "a", "g", "m", "s", "y", "5", "b", "h", "n", "t", "z" ],
"storageAccountPrefixesCount": "[length(variables('storageAccountPrefixes'))]",
"vmsPerStorageAccount": 20,

Просмотреть файл

@ -147,8 +147,8 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
],
"location": "[resourceGroup().location]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')), '/cse')]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')), '/cse')]",
"properties": {
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",

Просмотреть файл

@ -59,6 +59,13 @@
"description": "The azure deploy environment. Currently support: AzureCloud, AzureChinaCloud"
},
"type": "string"
},
"location": {
"defaultValue": "{{GetLocation}}",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
}
{{if GetClassicMode}}
,{{template "classicparams.t" .}}

Просмотреть файл

@ -8,7 +8,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(copyIndex(),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(copyIndex(),variables('storageAccountPrefixesCount'))],variables('storageAccountBaseClassicName'),copyIndex(1))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -19,7 +19,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -34,7 +34,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -90,7 +90,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), '-vmss')]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {

Просмотреть файл

@ -12,7 +12,7 @@
,"[variables('{{.Name}}LbID')]"
{{end}}
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
"ipConfigurations": [
@ -39,7 +39,7 @@
{{if .IsManagedDisks}}
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {
"platformFaultDomainCount": "3",
@ -58,7 +58,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -75,7 +75,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -85,7 +85,7 @@
{{end}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -94,7 +94,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -109,7 +109,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -162,7 +162,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
"availabilitySet": {

Просмотреть файл

@ -8,7 +8,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -19,7 +19,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -34,7 +34,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -89,7 +89,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), '-vmss')]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {

Просмотреть файл

@ -3,7 +3,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -13,7 +13,7 @@
{{if not .MasterProfile.IsCustomVNET}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -30,14 +30,14 @@
{{end}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -52,7 +52,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -82,7 +82,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -100,7 +100,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -127,7 +127,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -166,7 +166,7 @@
{
"creationSource" : "[concat('acsengine-', variables('masterVMNamePrefix'), copyIndex())]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -234,7 +234,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -54,7 +54,7 @@
"masterLbName": "[concat(variables('orchestratorName'), '-master-lb-', variables('nameSuffix'))]",
"masterPublicIPAddressName": "[concat(variables('orchestratorName'), '-master-ip-', variables('masterEndpointDNSNamePrefix'), '-', variables('nameSuffix'))]",
{{if .MasterProfile.IsClassicStorageAccount}}
"storageAccountBaseClassicName": "[concat(uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location)), variables('orchestratorName'))]",
"storageAccountBaseClassicName": "[concat(uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'))), variables('orchestratorName'))]",
"masterStorageAccountName": "[concat(variables('storageAccountBaseClassicName'), '0')]",
{{else}}
"masterStorageAccountName": "[concat(variables('storageAccountBaseName'), '0')]",
@ -117,10 +117,15 @@
"osImageSKU": "14.04.4-LTS",
{{end}}
"osImageVersion": "latest",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [ "0", "6", "c", "i", "o", "u", "1", "7", "d", "j", "p", "v", "2", "8", "e", "k", "q", "w", "3", "9", "f", "l", "r", "x", "4", "a", "g", "m", "s", "y", "5", "b", "h", "n", "t", "z" ],
"storageAccountPrefixesCount": "[length(variables('storageAccountPrefixes'))]",
"vmsPerStorageAccount": 20

Просмотреть файл

@ -12,8 +12,8 @@
,"[variables('{{.Name}}LbID')]"
{{end}}
],
"location": "[resourceGroup().location]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), 'nic-', copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
"ipConfigurations": [
{
@ -44,7 +44,7 @@
{{if .IsManagedDisks}}
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {
"platformFaultDomainCount": "3",
@ -63,7 +63,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -80,7 +80,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -90,7 +90,7 @@
{{end}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -99,7 +99,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -114,7 +114,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -180,8 +180,8 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
},
"location": "[resourceGroup().location]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]",
"properties": {
"availabilitySet": {
"id": "[resourceId('Microsoft.Compute/availabilitySets',variables('{{.Name}}AvailabilitySet'))]"
@ -241,8 +241,8 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')))]"
],
"location": "[resourceGroup().location]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')), '/cse')]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), copyIndex(variables('{{.Name}}Offset')), '/cse')]",
"properties": {
"publisher": "Microsoft.Compute",
"type": "CustomScriptExtension",

Просмотреть файл

@ -8,7 +8,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('{{.Name}}StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('{{.Name}}AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('{{.Name}}VMSize')].storageAccountType]"
@ -19,7 +19,7 @@
{{if IsPublic .Ports}}
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}IPAddressName')]",
"properties": {
"dnsSettings": {
@ -34,7 +34,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('{{.Name}}IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('{{.Name}}LbName')]",
"properties": {
"backendAddressPools": [
@ -103,7 +103,7 @@
{
"creationSource" : "[concat('acsengine-', variables('{{.Name}}VMNamePrefix'), '-vmss')]"
},
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('{{.Name}}VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {

Просмотреть файл

@ -204,7 +204,7 @@ func (t *TemplateGenerator) GenerateTemplate(containerService *api.ContainerServ
return templateRaw, parametersRaw, certsGenerated, err
}
templ = template.New("acs template").Funcs(t.getTemplateFuncMap(properties))
templ = template.New("acs template").Funcs(t.getTemplateFuncMap(containerService))
files, baseFile, e := prepareTemplateFiles(properties)
if e != nil {
@ -337,6 +337,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool) (map[string]int
parametersMap := map[string]interface{}{}
// Master Parameters
addValue(parametersMap, "location", location)
addValue(parametersMap, "targetEnvironment", GetCloudTargetEnv(location))
addValue(parametersMap, "linuxAdminUsername", properties.LinuxProfile.AdminUsername)
addValue(parametersMap, "masterEndpointDNSNamePrefix", properties.MasterProfile.DNSPrefix)
@ -464,34 +465,34 @@ func addSecret(m map[string]interface{}, k string, v interface{}, encode bool) {
}
// getTemplateFuncMap returns all functions used in template generation
func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[string]interface{} {
func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) map[string]interface{} {
return template.FuncMap{
"IsDCOS173": func() bool {
return properties.OrchestratorProfile.OrchestratorType == api.DCOS173
return cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS173
},
"IsDCOS184": func() bool {
return properties.OrchestratorProfile.OrchestratorType == api.DCOS184
return cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS184
},
"IsDCOS187": func() bool {
return properties.OrchestratorProfile.OrchestratorType == api.DCOS187
return cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS187
},
"IsDCOS188": func() bool {
return properties.OrchestratorProfile.OrchestratorType == api.DCOS188
return cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS188
},
"RequiresFakeAgentOutput": func() bool {
return properties.OrchestratorProfile.OrchestratorType == api.Kubernetes
return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes
},
"IsSwarmMode": func() bool {
return properties.OrchestratorProfile.IsSwarmMode()
return cs.Properties.OrchestratorProfile.IsSwarmMode()
},
"IsKubernetes": func() bool {
return properties.OrchestratorProfile.IsKubernetes()
return cs.Properties.OrchestratorProfile.IsKubernetes()
},
"IsPublic": func(ports []int) bool {
return len(ports) > 0
},
"GetVNETSubnetDependencies": func() string {
return getVNETSubnetDependencies(properties)
return getVNETSubnetDependencies(&cs.Properties)
},
"GetLBRules": func(name string, ports []int) string {
return getLBRules(name, ports)
@ -503,13 +504,13 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
return getSecurityRules(ports)
},
"GetUniqueNameSuffix": func() string {
return GenerateClusterID(properties)
return GenerateClusterID(&cs.Properties)
},
"GetVNETAddressPrefixes": func() string {
return getVNETAddressPrefixes(properties)
return getVNETAddressPrefixes(&cs.Properties)
},
"GetVNETSubnets": func(addNSG bool) string {
return getVNETSubnets(properties, addNSG)
return getVNETSubnets(&cs.Properties, addNSG)
},
"GetDataDisks": func(profile *api.AgentPoolProfile) string {
return getDataDisks(profile)
@ -517,24 +518,24 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
"GetDCOSMasterCustomData": func() string {
masterProvisionScript := getDCOSMasterProvisionScript()
masterAttributeContents := getDCOSMasterCustomNodeLabels()
str := getSingleLineDCOSCustomData(properties.OrchestratorProfile.OrchestratorType, properties.MasterProfile.Count, masterProvisionScript, masterAttributeContents)
str := getSingleLineDCOSCustomData(cs.Properties.OrchestratorProfile.OrchestratorType, cs.Properties.MasterProfile.Count, masterProvisionScript, masterAttributeContents)
return fmt.Sprintf("\"customData\": \"[base64(concat('#cloud-config\\n\\n', '%s'))]\",", str)
},
"GetDCOSAgentCustomData": func(profile *api.AgentPoolProfile) string {
agentProvisionScript := getDCOSAgentProvisionScript(profile)
attributeContents := getDCOSAgentCustomNodeLabels(profile)
str := getSingleLineDCOSCustomData(properties.OrchestratorProfile.OrchestratorType, properties.MasterProfile.Count, agentProvisionScript, attributeContents)
str := getSingleLineDCOSCustomData(cs.Properties.OrchestratorProfile.OrchestratorType, cs.Properties.MasterProfile.Count, agentProvisionScript, attributeContents)
return fmt.Sprintf("\"customData\": \"[base64(concat('#cloud-config\\n\\n', '%s'))]\",", str)
},
"GetMasterAllowedSizes": func() string {
if t.ClassicMode {
return GetClassicAllowedSizes()
} else if properties.OrchestratorProfile.OrchestratorType == api.DCOS188 ||
properties.OrchestratorProfile.OrchestratorType == api.DCOS187 ||
properties.OrchestratorProfile.OrchestratorType == api.DCOS184 ||
properties.OrchestratorProfile.OrchestratorType == api.DCOS173 {
} else if cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS188 ||
cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS187 ||
cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS184 ||
cs.Properties.OrchestratorProfile.OrchestratorType == api.DCOS173 {
return GetDCOSMasterAllowedSizes()
}
return GetMasterAgentAllowedSizes()
@ -617,6 +618,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
str = escapeSingleLine(str)
return fmt.Sprintf("\"customData\": \"[base64(concat('%s',variables('agentRunCmdFile'),variables('agentRunCmd')))]\",", str)
},
"GetLocation": func() string {
return cs.Location
},
"GetWinAgentSwarmCustomData": func() string {
str := getBase64CustomScript(swarmWindowsProvision)
return fmt.Sprintf("\"customData\": \"%s\"", str)
@ -652,13 +656,13 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
return fmt.Sprintf("\"customData\": \"[base64(concat('%s',variables('agentRunCmdFile'),variables('agentRunCmd')))]\",", str)
},
"GetKubernetesSubnets": func() string {
return getKubernetesSubnets(properties)
return getKubernetesSubnets(&cs.Properties)
},
"GetKubernetesPodStartIndex": func() string {
return fmt.Sprintf("%d", getKubernetesPodStartIndex(properties))
return fmt.Sprintf("%d", getKubernetesPodStartIndex(&cs.Properties))
},
"AnyAgentHasDisks": func() bool {
for _, agentProfile := range properties.AgentPoolProfiles {
for _, agentProfile := range cs.Properties.AgentPoolProfiles {
if agentProfile.HasDisks() {
return true
}
@ -666,7 +670,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
return false
},
"AnyAgentUsesAvailablilitySets": func() bool {
for _, agentProfile := range properties.AgentPoolProfiles {
for _, agentProfile := range cs.Properties.AgentPoolProfiles {
if agentProfile.IsAvailabilitySets() {
return true
}
@ -674,7 +678,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
return false
},
"HasLinuxAgents": func() bool {
for _, agentProfile := range properties.AgentPoolProfiles {
for _, agentProfile := range cs.Properties.AgentPoolProfiles {
if agentProfile.IsLinux() {
return true
}
@ -682,10 +686,10 @@ func (t *TemplateGenerator) getTemplateFuncMap(properties *api.Properties) map[s
return false
},
"HasLinuxSecrets": func() bool {
return properties.LinuxProfile.HasSecrets()
return cs.Properties.LinuxProfile.HasSecrets()
},
"HasWindowsSecrets": func() bool {
return properties.WindowsProfile.HasSecrets()
return cs.Properties.WindowsProfile.HasSecrets()
},
// inspired by http://stackoverflow.com/questions/18276173/calling-a-template-with-several-pipeline-parameters/18276968#18276968
"dict": func(values ...interface{}) (map[string]interface{}, error) {

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -597,6 +604,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 1,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -661,8 +673,8 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseClassicName": "[concat(uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location)), variables('orchestratorName'))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseClassicName": "[concat(uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'))), variables('orchestratorName'))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -964,7 +976,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(copyIndex(),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(copyIndex(),variables('storageAccountPrefixesCount'))],variables('storageAccountBaseClassicName'),copyIndex(1))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool1VMSize')].storageAccountType]"
@ -973,7 +985,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -988,7 +1000,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpool1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1LbName')]",
"properties": {
"backendAddressPools": [
@ -1113,7 +1125,7 @@
"[variables('vnetID')]",
"[variables('agentpool1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1202,7 +1214,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
@ -1220,7 +1232,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1300,7 +1312,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1309,7 +1321,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1344,14 +1356,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1366,7 +1378,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1396,7 +1408,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1414,7 +1426,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1439,7 +1451,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1474,7 +1486,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1537,7 +1549,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -660,6 +660,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -794,6 +801,11 @@
"apiVersionStorageManagedDisks": "2016-04-30-preview",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -836,7 +848,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1132,7 +1144,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128NSGName')]",
"properties": {
"securityRules": []
@ -1148,7 +1160,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1167,7 +1179,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {
"managed": "true",
@ -1186,7 +1198,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1256,7 +1268,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicNSGName')]",
"properties": {
"securityRules": [
@ -1316,7 +1328,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1340,7 +1352,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {
"managed": "true",
@ -1351,7 +1363,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1366,7 +1378,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1489,7 +1501,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1547,7 +1559,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1559,7 +1571,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1572,7 +1584,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent128NSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent1publicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1613,14 +1625,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1635,7 +1647,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1665,7 +1677,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1680,7 +1692,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1714,7 +1726,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1757,7 +1769,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1816,7 +1828,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -574,6 +581,11 @@
"apiVersionStorageManagedDisks": "2016-04-30-preview",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -616,7 +628,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -912,7 +924,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128NSGName')]",
"properties": {
"securityRules": []
@ -924,7 +936,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1015,7 +1027,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicNSGName')]",
"properties": {
"securityRules": [
@ -1067,7 +1079,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1082,7 +1094,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1201,7 +1213,7 @@
"[variables('vnetID')]",
"[concat('Microsoft.Network/loadBalancers/', variables('agent1publicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1285,7 +1297,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1297,7 +1309,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1310,7 +1322,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent128NSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent1publicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1351,14 +1363,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1373,7 +1385,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1403,7 +1415,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1418,7 +1430,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1452,7 +1464,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1495,7 +1507,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1554,7 +1566,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -759,6 +759,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -955,7 +962,11 @@
"kubernetesHyperkubeSpec": "[parameters('kubernetesHyperkubeSpec')]",
"kubernetesKubeDNSSpec": "[parameters('kubernetesKubeDNSSpec')]",
"kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]",
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -1043,7 +1054,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1469,7 +1480,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1608,7 +1619,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1983,7 +1994,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -74,6 +74,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -653,6 +653,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -814,6 +821,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -878,7 +890,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1180,7 +1192,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1199,7 +1211,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {
"managed": "true",
@ -1218,7 +1230,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1296,7 +1308,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1320,7 +1332,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {
"managed": "true",
@ -1331,7 +1343,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1346,7 +1358,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1469,7 +1481,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1527,7 +1539,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1536,7 +1548,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1571,14 +1583,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1593,7 +1605,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1623,7 +1635,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1641,7 +1653,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1666,7 +1678,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1701,7 +1713,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1764,7 +1776,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -594,6 +601,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -658,7 +670,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -957,7 +969,7 @@
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1048,7 +1060,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1063,7 +1075,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1183,7 +1195,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1267,7 +1279,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1276,7 +1288,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1311,14 +1323,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1333,7 +1345,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1363,7 +1375,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1381,7 +1393,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1406,7 +1418,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1441,7 +1453,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1504,7 +1516,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -653,6 +653,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -833,6 +840,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -898,7 +910,7 @@
"singleQuote": "'",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1205,7 +1217,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1224,7 +1236,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {
"managed": "true",
@ -1243,7 +1255,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1310,7 +1322,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')), '/cse')]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1333,7 +1345,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1362,7 +1374,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {
"managed": "true",
@ -1373,7 +1385,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1388,7 +1400,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1524,7 +1536,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1576,7 +1588,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')), '/cse')]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1594,7 +1606,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1603,7 +1615,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1638,14 +1650,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1660,7 +1672,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1690,7 +1702,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1708,7 +1720,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1733,7 +1745,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1768,7 +1780,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1831,7 +1843,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -613,6 +620,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -678,7 +690,7 @@
"singleQuote": "'",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -982,7 +994,7 @@
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1057,7 +1069,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1072,7 +1084,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1206,7 +1218,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1294,7 +1306,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1303,7 +1315,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1338,14 +1350,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1360,7 +1372,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1390,7 +1402,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1408,7 +1420,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1433,7 +1445,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1468,7 +1480,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1531,7 +1543,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -653,6 +653,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -814,6 +821,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -878,7 +890,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1180,7 +1192,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1199,7 +1211,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {
"managed": "true",
@ -1218,7 +1230,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1296,7 +1308,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1320,7 +1332,7 @@
},
{
"apiVersion": "[variables('apiVersionStorageManagedDisks')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {
"managed": "true",
@ -1331,7 +1343,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1346,7 +1358,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1469,7 +1481,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1527,7 +1539,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1536,7 +1548,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1571,14 +1583,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1593,7 +1605,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1623,7 +1635,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1641,7 +1653,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1666,7 +1678,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1701,7 +1713,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1764,7 +1776,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -594,6 +601,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -658,7 +670,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -957,7 +969,7 @@
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1048,7 +1060,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1063,7 +1075,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1183,7 +1195,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1267,7 +1279,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1276,7 +1288,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1311,14 +1323,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1333,7 +1345,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1363,7 +1375,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1381,7 +1393,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1406,7 +1418,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1441,7 +1453,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1504,7 +1516,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -660,6 +660,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -801,6 +808,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -843,7 +855,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1139,7 +1151,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128NSGName')]",
"properties": {
"securityRules": []
@ -1155,7 +1167,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1181,7 +1193,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1197,7 +1209,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1206,7 +1218,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -1223,7 +1235,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1317,7 +1329,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicNSGName')]",
"properties": {
"securityRules": [
@ -1377,7 +1389,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1408,7 +1420,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1424,7 +1436,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicDataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1433,14 +1445,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1455,7 +1467,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1580,7 +1592,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1650,7 +1662,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1662,7 +1674,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1675,7 +1687,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent128NSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agent1publicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1716,14 +1728,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1738,7 +1750,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1768,7 +1780,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1783,7 +1795,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1817,7 +1829,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1860,7 +1872,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1919,7 +1931,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -759,6 +759,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -954,7 +961,11 @@
"kubernetesHyperkubeSpec": "[parameters('kubernetesHyperkubeSpec')]",
"kubernetesKubeDNSSpec": "[parameters('kubernetesKubeDNSSpec')]",
"kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]",
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -1042,7 +1053,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1522,7 +1533,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1715,7 +1726,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -2090,7 +2101,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -74,6 +74,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -653,6 +653,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -821,6 +828,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -885,7 +897,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1187,7 +1199,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1213,7 +1225,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1229,7 +1241,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1238,7 +1250,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -1255,7 +1267,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1357,7 +1369,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1388,7 +1400,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1404,7 +1416,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicDataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1413,14 +1425,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1435,7 +1447,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1560,7 +1572,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1630,7 +1642,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1639,7 +1651,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1674,14 +1686,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1696,7 +1708,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1726,7 +1738,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1744,7 +1756,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1769,7 +1781,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1804,7 +1816,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1867,7 +1879,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -653,6 +653,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -821,6 +828,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -885,7 +897,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1187,7 +1199,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"properties": {
"ipConfigurations": [
@ -1213,7 +1225,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1229,7 +1241,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent128StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent128DataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent128VMSize')].storageAccountType]"
@ -1238,7 +1250,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent128AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -1255,7 +1267,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent128VMNamePrefix'), 'nic-', copyIndex(variables('agent128Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent128AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent128VMNamePrefix'), copyIndex(variables('agent128Offset')))]",
"properties": {
"availabilitySet": {
@ -1357,7 +1369,7 @@
"[variables('vnetID')]",
"[variables('agent1publicLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"properties": {
"ipConfigurations": [
@ -1388,7 +1400,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1404,7 +1416,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(variables('dataStorageAccountPrefixSeed')),variables('agent1publicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agent1publicDataAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agent1publicVMSize')].storageAccountType]"
@ -1413,14 +1425,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1435,7 +1447,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agent1publicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agent1publicLbName')]",
"properties": {
"backendAddressPools": [
@ -1560,7 +1572,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agent1publicVMNamePrefix'), 'nic-', copyIndex(variables('agent1publicOffset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agent1publicAvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agent1publicVMNamePrefix'), copyIndex(variables('agent1publicOffset')))]",
"properties": {
"availabilitySet": {
@ -1630,7 +1642,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1639,7 +1651,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1674,14 +1686,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1696,7 +1708,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1726,7 +1738,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1744,7 +1756,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1769,7 +1781,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1804,7 +1816,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1867,7 +1879,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -454,6 +454,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -601,6 +608,11 @@
]
}
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -643,7 +655,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -939,7 +951,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -955,7 +967,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -972,7 +984,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1050,7 +1062,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1109,7 +1121,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1118,7 +1130,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1133,7 +1145,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1257,7 +1269,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1343,7 +1355,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1355,7 +1367,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1368,7 +1380,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1409,14 +1421,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1431,7 +1443,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1461,7 +1473,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1476,7 +1488,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1510,7 +1522,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1553,7 +1565,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1613,7 +1625,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -35,6 +35,9 @@
"linuxKeyVaultID0CertificateURL0": {
"value": "http://url1"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -771,6 +771,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -975,7 +982,11 @@
]
}
],
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -1063,7 +1074,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1489,7 +1500,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1628,7 +1639,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -2004,7 +2015,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -80,6 +80,9 @@
"linuxKeyVaultID0CertificateURL0": {
"value": "http://url1"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -666,6 +666,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -907,6 +914,11 @@
]
}
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 1,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -972,7 +984,7 @@
"singleQuote": "'",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1303,7 +1315,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool1VMSize')].storageAccountType]"
@ -1312,7 +1324,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -1327,7 +1339,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpool1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1LbName')]",
"properties": {
"backendAddressPools": [
@ -1452,7 +1464,7 @@
"[variables('vnetID')]",
"[variables('agentpool1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1542,7 +1554,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
@ -1560,7 +1572,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1645,7 +1657,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpoolwStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpoolwStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpoolwAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpoolwVMSize')].storageAccountType]"
@ -1663,7 +1675,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpoolwStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpoolwStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpoolwAccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpoolwVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1750,7 +1762,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1759,7 +1771,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1801,14 +1813,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1823,7 +1835,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1853,7 +1865,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1871,7 +1883,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1896,7 +1908,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1931,7 +1943,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1995,7 +2007,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -47,6 +47,9 @@
"linuxKeyVaultID1CertificateURL0": {
"value": "http://url1"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -459,6 +459,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -643,6 +650,11 @@
]
}
],
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 1,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -707,7 +719,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1009,7 +1021,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool1VMSize')].storageAccountType]"
@ -1018,7 +1030,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -1033,7 +1045,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpool1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1LbName')]",
"properties": {
"backendAddressPools": [
@ -1158,7 +1170,7 @@
"[variables('vnetID')]",
"[variables('agentpool1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1248,7 +1260,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
@ -1266,7 +1278,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1347,7 +1359,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1356,7 +1368,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1391,14 +1403,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1413,7 +1425,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1443,7 +1455,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1461,7 +1473,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1486,7 +1498,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1521,7 +1533,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1585,7 +1597,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -38,6 +38,9 @@
"linuxKeyVaultID1CertificateURL0": {
"value": "http://url1"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -759,6 +759,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -951,7 +958,11 @@
"kubernetesHyperkubeSpec": "[parameters('kubernetesHyperkubeSpec')]",
"kubernetesKubeDNSSpec": "[parameters('kubernetesKubeDNSSpec')]",
"kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]",
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -1039,7 +1050,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1464,7 +1475,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1602,7 +1613,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1977,7 +1988,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -80,6 +80,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -3820,6 +3820,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -4089,6 +4096,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -4131,7 +4143,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -4427,7 +4439,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri0NSGName')]",
"properties": {
"securityRules": []
@ -4443,7 +4455,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"properties": {
"ipConfigurations": [
@ -4469,7 +4481,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -4478,7 +4490,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri0AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4494,7 +4506,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri0AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), copyIndex(variables('agentpri0Offset')))]",
"properties": {
"availabilitySet": {
@ -4550,7 +4562,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri1NSGName')]",
"properties": {
"securityRules": []
@ -4566,7 +4578,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"properties": {
"ipConfigurations": [
@ -4592,7 +4604,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -4601,7 +4613,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri1AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4617,7 +4629,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri1AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), copyIndex(variables('agentpri1Offset')))]",
"properties": {
"availabilitySet": {
@ -4673,7 +4685,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri2NSGName')]",
"properties": {
"securityRules": []
@ -4689,7 +4701,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"properties": {
"ipConfigurations": [
@ -4715,7 +4727,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -4724,7 +4736,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri2AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4740,7 +4752,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri2AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), copyIndex(variables('agentpri2Offset')))]",
"properties": {
"availabilitySet": {
@ -4796,7 +4808,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri3NSGName')]",
"properties": {
"securityRules": []
@ -4812,7 +4824,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"properties": {
"ipConfigurations": [
@ -4838,7 +4850,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -4847,7 +4859,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri3AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4863,7 +4875,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri3AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), copyIndex(variables('agentpri3Offset')))]",
"properties": {
"availabilitySet": {
@ -4919,7 +4931,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri4NSGName')]",
"properties": {
"securityRules": []
@ -4935,7 +4947,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"properties": {
"ipConfigurations": [
@ -4961,7 +4973,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -4970,7 +4982,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri4AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4986,7 +4998,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri4AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), copyIndex(variables('agentpri4Offset')))]",
"properties": {
"availabilitySet": {
@ -5042,7 +5054,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri5NSGName')]",
"properties": {
"securityRules": []
@ -5058,7 +5070,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"properties": {
"ipConfigurations": [
@ -5084,7 +5096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -5093,7 +5105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri5AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5109,7 +5121,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri5AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), copyIndex(variables('agentpri5Offset')))]",
"properties": {
"availabilitySet": {
@ -5165,7 +5177,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri6NSGName')]",
"properties": {
"securityRules": []
@ -5181,7 +5193,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"properties": {
"ipConfigurations": [
@ -5207,7 +5219,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -5216,7 +5228,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri6AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5232,7 +5244,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri6AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), copyIndex(variables('agentpri6Offset')))]",
"properties": {
"availabilitySet": {
@ -5288,7 +5300,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri7NSGName')]",
"properties": {
"securityRules": []
@ -5304,7 +5316,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"properties": {
"ipConfigurations": [
@ -5330,7 +5342,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -5339,7 +5351,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri7AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5355,7 +5367,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri7AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), copyIndex(variables('agentpri7Offset')))]",
"properties": {
"availabilitySet": {
@ -5411,7 +5423,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri8NSGName')]",
"properties": {
"securityRules": []
@ -5427,7 +5439,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"properties": {
"ipConfigurations": [
@ -5453,7 +5465,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -5462,7 +5474,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri8AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5478,7 +5490,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri8AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), copyIndex(variables('agentpri8Offset')))]",
"properties": {
"availabilitySet": {
@ -5534,7 +5546,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri9NSGName')]",
"properties": {
"securityRules": []
@ -5550,7 +5562,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"properties": {
"ipConfigurations": [
@ -5576,7 +5588,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -5585,7 +5597,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri9AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5601,7 +5613,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri9AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), copyIndex(variables('agentpri9Offset')))]",
"properties": {
"availabilitySet": {
@ -5657,7 +5669,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri10NSGName')]",
"properties": {
"securityRules": []
@ -5673,7 +5685,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"properties": {
"ipConfigurations": [
@ -5699,7 +5711,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -5708,7 +5720,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri10AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5724,7 +5736,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri10AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), copyIndex(variables('agentpri10Offset')))]",
"properties": {
"availabilitySet": {
@ -5780,7 +5792,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1NSGName')]",
"properties": {
"securityRules": [
@ -5840,7 +5852,7 @@
"[variables('vnetID')]",
"[variables('agentpublic1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublic1VMNamePrefix'), 'nic-', copyIndex(variables('agentpublic1Offset')))]",
"properties": {
"ipConfigurations": [
@ -5871,7 +5883,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublic1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublic1VMSize')].storageAccountType]"
@ -5880,14 +5892,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -5902,7 +5914,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublic1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1LbName')]",
"properties": {
"backendAddressPools": [
@ -6026,7 +6038,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpublic1VMNamePrefix'), 'nic-', copyIndex(variables('agentpublic1Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpublic1AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublic1VMNamePrefix'), copyIndex(variables('agentpublic1Offset')))]",
"properties": {
"availabilitySet": {
@ -6085,7 +6097,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -6097,7 +6109,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -6120,7 +6132,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpri10NSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublic1NSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -6261,14 +6273,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -6283,7 +6295,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -6313,7 +6325,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -6328,7 +6340,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -6362,7 +6374,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -6405,7 +6417,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -6464,7 +6476,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -119,6 +119,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -2512,6 +2512,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -2757,6 +2764,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -2799,7 +2811,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -3095,7 +3107,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri0NSGName')]",
"properties": {
"securityRules": []
@ -3111,7 +3123,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -3128,7 +3140,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3205,7 +3217,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri1NSGName')]",
"properties": {
"securityRules": []
@ -3221,7 +3233,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -3238,7 +3250,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3315,7 +3327,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri2NSGName')]",
"properties": {
"securityRules": []
@ -3331,7 +3343,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -3348,7 +3360,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3425,7 +3437,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri3NSGName')]",
"properties": {
"securityRules": []
@ -3441,7 +3453,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -3458,7 +3470,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3535,7 +3547,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri4NSGName')]",
"properties": {
"securityRules": []
@ -3551,7 +3563,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -3568,7 +3580,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3645,7 +3657,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri5NSGName')]",
"properties": {
"securityRules": []
@ -3661,7 +3673,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -3678,7 +3690,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3755,7 +3767,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri6NSGName')]",
"properties": {
"securityRules": []
@ -3771,7 +3783,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -3788,7 +3800,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3865,7 +3877,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri7NSGName')]",
"properties": {
"securityRules": []
@ -3881,7 +3893,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -3898,7 +3910,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3975,7 +3987,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri8NSGName')]",
"properties": {
"securityRules": []
@ -3991,7 +4003,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -4008,7 +4020,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4085,7 +4097,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri9NSGName')]",
"properties": {
"securityRules": []
@ -4101,7 +4113,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -4118,7 +4130,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4195,7 +4207,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri10NSGName')]",
"properties": {
"securityRules": []
@ -4211,7 +4223,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -4228,7 +4240,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4305,7 +4317,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1NSGName')]",
"properties": {
"securityRules": [
@ -4364,7 +4376,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublic1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublic1VMSize')].storageAccountType]"
@ -4373,7 +4385,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -4388,7 +4400,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublic1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1LbName')]",
"properties": {
"backendAddressPools": [
@ -4512,7 +4524,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublic1AccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublic1LbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublic1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4597,7 +4609,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -4609,7 +4621,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -4632,7 +4644,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpri10NSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublic1NSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -4773,14 +4785,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -4795,7 +4807,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -4825,7 +4837,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -4840,7 +4852,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -4874,7 +4886,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -4917,7 +4929,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -4976,7 +4988,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -119,6 +119,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -3919,6 +3919,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -4221,7 +4228,11 @@
"kubernetesHyperkubeSpec": "[parameters('kubernetesHyperkubeSpec')]",
"kubernetesKubeDNSSpec": "[parameters('kubernetesKubeDNSSpec')]",
"kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]",
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -4309,7 +4320,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -4734,7 +4745,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -4872,7 +4883,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5010,7 +5021,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool3VMNamePrefix'), copyIndex(variables('agentpool3Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool3VMNamePrefix'), copyIndex(variables('agentpool3Offset')),'/cse', copyIndex(variables('agentpool3Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5148,7 +5159,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool4VMNamePrefix'), copyIndex(variables('agentpool4Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool4VMNamePrefix'), copyIndex(variables('agentpool4Offset')),'/cse', copyIndex(variables('agentpool4Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5286,7 +5297,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool5VMNamePrefix'), copyIndex(variables('agentpool5Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool5VMNamePrefix'), copyIndex(variables('agentpool5Offset')),'/cse', copyIndex(variables('agentpool5Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5424,7 +5435,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool6VMNamePrefix'), copyIndex(variables('agentpool6Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool6VMNamePrefix'), copyIndex(variables('agentpool6Offset')),'/cse', copyIndex(variables('agentpool6Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5562,7 +5573,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool7VMNamePrefix'), copyIndex(variables('agentpool7Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool7VMNamePrefix'), copyIndex(variables('agentpool7Offset')),'/cse', copyIndex(variables('agentpool7Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5700,7 +5711,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool8VMNamePrefix'), copyIndex(variables('agentpool8Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool8VMNamePrefix'), copyIndex(variables('agentpool8Offset')),'/cse', copyIndex(variables('agentpool8Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5838,7 +5849,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool9VMNamePrefix'), copyIndex(variables('agentpool9Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool9VMNamePrefix'), copyIndex(variables('agentpool9Offset')),'/cse', copyIndex(variables('agentpool9Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -5976,7 +5987,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool10VMNamePrefix'), copyIndex(variables('agentpool10Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool10VMNamePrefix'), copyIndex(variables('agentpool10Offset')),'/cse', copyIndex(variables('agentpool10Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -6114,7 +6125,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool11VMNamePrefix'), copyIndex(variables('agentpool11Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool11VMNamePrefix'), copyIndex(variables('agentpool11Offset')),'/cse', copyIndex(variables('agentpool11Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -6252,7 +6263,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool12VMNamePrefix'), copyIndex(variables('agentpool12Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool12VMNamePrefix'), copyIndex(variables('agentpool12Offset')),'/cse', copyIndex(variables('agentpool12Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -6627,7 +6638,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -164,6 +164,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -2505,6 +2505,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -2767,6 +2774,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -2831,7 +2843,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -3133,7 +3145,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -3151,7 +3163,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3235,7 +3247,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -3253,7 +3265,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3337,7 +3349,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -3355,7 +3367,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3439,7 +3451,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -3457,7 +3469,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3541,7 +3553,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -3559,7 +3571,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3643,7 +3655,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -3661,7 +3673,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3745,7 +3757,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -3763,7 +3775,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3847,7 +3859,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -3865,7 +3877,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3949,7 +3961,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -3967,7 +3979,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4051,7 +4063,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -4069,7 +4081,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4153,7 +4165,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -4171,7 +4183,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4255,7 +4267,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublic1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublic1VMSize')].storageAccountType]"
@ -4264,7 +4276,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -4279,7 +4291,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublic1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1LbName')]",
"properties": {
"backendAddressPools": [
@ -4404,7 +4416,7 @@
"[variables('vnetID')]",
"[variables('agentpublic1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublic1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4489,7 +4501,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -4498,7 +4510,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -4603,14 +4615,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -4625,7 +4637,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -4655,7 +4667,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -4673,7 +4685,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -4698,7 +4710,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -4733,7 +4745,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -4796,7 +4808,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -116,6 +116,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -2505,6 +2505,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -2767,6 +2774,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -2831,7 +2843,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -3133,7 +3145,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -3151,7 +3163,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3235,7 +3247,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -3253,7 +3265,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3337,7 +3349,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -3355,7 +3367,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3439,7 +3451,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -3457,7 +3469,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3541,7 +3553,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -3559,7 +3571,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3643,7 +3655,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -3661,7 +3673,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3745,7 +3757,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -3763,7 +3775,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3847,7 +3859,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -3865,7 +3877,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -3949,7 +3961,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -3967,7 +3979,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4051,7 +4063,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -4069,7 +4081,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4153,7 +4165,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -4171,7 +4183,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4255,7 +4267,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublic1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublic1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublic1VMSize')].storageAccountType]"
@ -4264,7 +4276,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -4279,7 +4291,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublic1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublic1LbName')]",
"properties": {
"backendAddressPools": [
@ -4404,7 +4416,7 @@
"[variables('vnetID')]",
"[variables('agentpublic1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublic1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -4489,7 +4501,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -4498,7 +4510,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -4603,14 +4615,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -4625,7 +4637,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -4655,7 +4667,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -4673,7 +4685,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -4698,7 +4710,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -4733,7 +4745,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -4796,7 +4808,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -116,6 +116,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -3807,6 +3807,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -4086,6 +4093,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -4150,7 +4162,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -4452,7 +4464,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"properties": {
"ipConfigurations": [
@ -4478,7 +4490,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -4487,7 +4499,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri0AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4503,7 +4515,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri0AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), copyIndex(variables('agentpri0Offset')))]",
"properties": {
"availabilitySet": {
@ -4566,7 +4578,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"properties": {
"ipConfigurations": [
@ -4592,7 +4604,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -4601,7 +4613,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri1AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4617,7 +4629,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri1AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), copyIndex(variables('agentpri1Offset')))]",
"properties": {
"availabilitySet": {
@ -4680,7 +4692,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"properties": {
"ipConfigurations": [
@ -4706,7 +4718,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -4715,7 +4727,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri2AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4731,7 +4743,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri2AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), copyIndex(variables('agentpri2Offset')))]",
"properties": {
"availabilitySet": {
@ -4794,7 +4806,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"properties": {
"ipConfigurations": [
@ -4820,7 +4832,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -4829,7 +4841,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri3AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4845,7 +4857,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri3AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), copyIndex(variables('agentpri3Offset')))]",
"properties": {
"availabilitySet": {
@ -4908,7 +4920,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"properties": {
"ipConfigurations": [
@ -4934,7 +4946,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -4943,7 +4955,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri4AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4959,7 +4971,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri4AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), copyIndex(variables('agentpri4Offset')))]",
"properties": {
"availabilitySet": {
@ -5022,7 +5034,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"properties": {
"ipConfigurations": [
@ -5048,7 +5060,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -5057,7 +5069,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri5AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5073,7 +5085,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri5AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), copyIndex(variables('agentpri5Offset')))]",
"properties": {
"availabilitySet": {
@ -5136,7 +5148,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"properties": {
"ipConfigurations": [
@ -5162,7 +5174,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -5171,7 +5183,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri6AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5187,7 +5199,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri6AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), copyIndex(variables('agentpri6Offset')))]",
"properties": {
"availabilitySet": {
@ -5250,7 +5262,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"properties": {
"ipConfigurations": [
@ -5276,7 +5288,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -5285,7 +5297,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri7AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5301,7 +5313,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri7AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), copyIndex(variables('agentpri7Offset')))]",
"properties": {
"availabilitySet": {
@ -5364,7 +5376,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"properties": {
"ipConfigurations": [
@ -5390,7 +5402,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -5399,7 +5411,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri8AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5415,7 +5427,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri8AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), copyIndex(variables('agentpri8Offset')))]",
"properties": {
"availabilitySet": {
@ -5478,7 +5490,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"properties": {
"ipConfigurations": [
@ -5504,7 +5516,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -5513,7 +5525,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri9AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5529,7 +5541,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri9AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), copyIndex(variables('agentpri9Offset')))]",
"properties": {
"availabilitySet": {
@ -5592,7 +5604,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"properties": {
"ipConfigurations": [
@ -5618,7 +5630,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -5627,7 +5639,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri10AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5643,7 +5655,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri10AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), copyIndex(variables('agentpri10Offset')))]",
"properties": {
"availabilitySet": {
@ -5706,7 +5718,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri11VMNamePrefix'), 'nic-', copyIndex(variables('agentpri11Offset')))]",
"properties": {
"ipConfigurations": [
@ -5732,7 +5744,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri11StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri11StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri11AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri11VMSize')].storageAccountType]"
@ -5741,7 +5753,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri11AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5757,7 +5769,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri11VMNamePrefix'), 'nic-', copyIndex(variables('agentpri11Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri11AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri11VMNamePrefix'), copyIndex(variables('agentpri11Offset')))]",
"properties": {
"availabilitySet": {
@ -5816,7 +5828,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -5825,7 +5837,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -5930,14 +5942,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -5952,7 +5964,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -5982,7 +5994,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -6000,7 +6012,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -6025,7 +6037,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -6060,7 +6072,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -6123,7 +6135,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -113,6 +113,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -3807,6 +3807,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -4086,6 +4093,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -4150,7 +4162,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -4452,7 +4464,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"properties": {
"ipConfigurations": [
@ -4478,7 +4490,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri0StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri0AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri0VMSize')].storageAccountType]"
@ -4487,7 +4499,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri0AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4503,7 +4515,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri0VMNamePrefix'), 'nic-', copyIndex(variables('agentpri0Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri0AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri0VMNamePrefix'), copyIndex(variables('agentpri0Offset')))]",
"properties": {
"availabilitySet": {
@ -4566,7 +4578,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"properties": {
"ipConfigurations": [
@ -4592,7 +4604,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri1VMSize')].storageAccountType]"
@ -4601,7 +4613,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri1AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4617,7 +4629,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri1VMNamePrefix'), 'nic-', copyIndex(variables('agentpri1Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri1AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri1VMNamePrefix'), copyIndex(variables('agentpri1Offset')))]",
"properties": {
"availabilitySet": {
@ -4680,7 +4692,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"properties": {
"ipConfigurations": [
@ -4706,7 +4718,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri2VMSize')].storageAccountType]"
@ -4715,7 +4727,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri2AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4731,7 +4743,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri2VMNamePrefix'), 'nic-', copyIndex(variables('agentpri2Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri2AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri2VMNamePrefix'), copyIndex(variables('agentpri2Offset')))]",
"properties": {
"availabilitySet": {
@ -4794,7 +4806,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"properties": {
"ipConfigurations": [
@ -4820,7 +4832,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri3StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri3AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri3VMSize')].storageAccountType]"
@ -4829,7 +4841,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri3AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4845,7 +4857,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri3VMNamePrefix'), 'nic-', copyIndex(variables('agentpri3Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri3AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri3VMNamePrefix'), copyIndex(variables('agentpri3Offset')))]",
"properties": {
"availabilitySet": {
@ -4908,7 +4920,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"properties": {
"ipConfigurations": [
@ -4934,7 +4946,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri4StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri4AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri4VMSize')].storageAccountType]"
@ -4943,7 +4955,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri4AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -4959,7 +4971,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri4VMNamePrefix'), 'nic-', copyIndex(variables('agentpri4Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri4AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri4VMNamePrefix'), copyIndex(variables('agentpri4Offset')))]",
"properties": {
"availabilitySet": {
@ -5022,7 +5034,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"properties": {
"ipConfigurations": [
@ -5048,7 +5060,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri5StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri5AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri5VMSize')].storageAccountType]"
@ -5057,7 +5069,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri5AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5073,7 +5085,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri5VMNamePrefix'), 'nic-', copyIndex(variables('agentpri5Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri5AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri5VMNamePrefix'), copyIndex(variables('agentpri5Offset')))]",
"properties": {
"availabilitySet": {
@ -5136,7 +5148,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"properties": {
"ipConfigurations": [
@ -5162,7 +5174,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri6StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri6AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri6VMSize')].storageAccountType]"
@ -5171,7 +5183,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri6AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5187,7 +5199,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri6VMNamePrefix'), 'nic-', copyIndex(variables('agentpri6Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri6AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri6VMNamePrefix'), copyIndex(variables('agentpri6Offset')))]",
"properties": {
"availabilitySet": {
@ -5250,7 +5262,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"properties": {
"ipConfigurations": [
@ -5276,7 +5288,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri7StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri7AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri7VMSize')].storageAccountType]"
@ -5285,7 +5297,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri7AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5301,7 +5313,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri7VMNamePrefix'), 'nic-', copyIndex(variables('agentpri7Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri7AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri7VMNamePrefix'), copyIndex(variables('agentpri7Offset')))]",
"properties": {
"availabilitySet": {
@ -5364,7 +5376,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"properties": {
"ipConfigurations": [
@ -5390,7 +5402,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri8StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri8AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri8VMSize')].storageAccountType]"
@ -5399,7 +5411,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri8AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5415,7 +5427,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri8VMNamePrefix'), 'nic-', copyIndex(variables('agentpri8Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri8AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri8VMNamePrefix'), copyIndex(variables('agentpri8Offset')))]",
"properties": {
"availabilitySet": {
@ -5478,7 +5490,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"properties": {
"ipConfigurations": [
@ -5504,7 +5516,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri9StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri9AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri9VMSize')].storageAccountType]"
@ -5513,7 +5525,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri9AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5529,7 +5541,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri9VMNamePrefix'), 'nic-', copyIndex(variables('agentpri9Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri9AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri9VMNamePrefix'), copyIndex(variables('agentpri9Offset')))]",
"properties": {
"availabilitySet": {
@ -5592,7 +5604,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"properties": {
"ipConfigurations": [
@ -5618,7 +5630,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri10StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri10AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri10VMSize')].storageAccountType]"
@ -5627,7 +5639,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri10AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5643,7 +5655,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri10VMNamePrefix'), 'nic-', copyIndex(variables('agentpri10Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri10AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri10VMNamePrefix'), copyIndex(variables('agentpri10Offset')))]",
"properties": {
"availabilitySet": {
@ -5706,7 +5718,7 @@
"dependsOn": [
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri11VMNamePrefix'), 'nic-', copyIndex(variables('agentpri11Offset')))]",
"properties": {
"ipConfigurations": [
@ -5732,7 +5744,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpri11StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpri11StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpri11AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpri11VMSize')].storageAccountType]"
@ -5741,7 +5753,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpri11AvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
@ -5757,7 +5769,7 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('agentpri11VMNamePrefix'), 'nic-', copyIndex(variables('agentpri11Offset')))]",
"[concat('Microsoft.Compute/availabilitySets/', variables('agentpri11AvailabilitySet'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpri11VMNamePrefix'), copyIndex(variables('agentpri11Offset')))]",
"properties": {
"availabilitySet": {
@ -5816,7 +5828,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -5825,7 +5837,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -5930,14 +5942,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -5952,7 +5964,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -5982,7 +5994,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -6000,7 +6012,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -6025,7 +6037,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -6060,7 +6072,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -6123,7 +6135,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -113,6 +113,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

42
pkg/acsengine/testdata/location/dcos.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,42 @@
{
"apiVersion": "vlabs",
"location": "eastus",
"properties": {
"orchestratorProfile": {
"orchestratorType": "DCOS"
},
"masterProfile": {
"count": 3,
"dnsPrefix": "masterdns1",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentprivate",
"count": 3,
"vmSize": "Standard_D2_v2"
},
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"dnsPrefix": "agentpublic1",
"ports": [
80,
443,
8080
]
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "ssh-rsa PUBLICKEY azureuser@linuxvm"
}
]
}
}
}
}

1625
pkg/acsengine/testdata/location/dcos_expected.json поставляемый Normal file

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

50
pkg/acsengine/testdata/location/dcos_expected_params.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,50 @@
{
"agentprivateCount": {
"value": 3
},
"agentprivateSubnet": {
"value": "10.0.0.0/16"
},
"agentprivateVMSize": {
"value": "Standard_D2_v2"
},
"agentpublicCount": {
"value": 3
},
"agentpublicEndpointDNSNamePrefix": {
"value": "agentpublic1"
},
"agentpublicSubnet": {
"value": "10.1.0.0/16"
},
"agentpublicVMSize": {
"value": "Standard_D2_v2"
},
"dcosBootstrapURL": {
"value": "https://dcosio.azureedge.net/dcos/stable/bootstrap/5df43052907c021eeb5de145419a3da1898c58a5.bootstrap.tar.xz"
},
"firstConsecutiveStaticIP": {
"value": "172.16.0.5"
},
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": "eastus"
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},
"masterSubnet": {
"value": "172.16.0.0/24"
},
"masterVMSize": {
"value": "Standard_D2_v2"
},
"sshRSAPublicKey": {
"value": "ssh-rsa PUBLICKEY azureuser@linuxvm"
},
"targetEnvironment": {
"value": "AzurePublicCloud"
}
}

51
pkg/acsengine/testdata/location/kubernetes.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,51 @@
{
"apiVersion": "vlabs",
"location": "westus",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "masterdns1",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
},
{
"name": "agentpool2",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "ssh-rsa PUBLICKEY azureuser@linuxvm"
}
]
}
},
"servicePrincipalProfile": {
"servicePrincipalClientID": "ServicePrincipalClientID",
"servicePrincipalClientSecret": "myServicePrincipalClientSecret"
},
"certificateProfile": {
"caCertificate": "caCertificate",
"apiServerCertificate": "apiServerCertificate",
"apiServerPrivateKey": "apiServerPrivateKey",
"clientCertificate": "clientCertificate",
"clientPrivateKey": "clientPrivateKey",
"kubeConfigCertificate": "kubeConfigCertificate",
"kubeConfigPrivateKey": "kubeConfigPrivateKey"
}
}
}

2036
pkg/acsengine/testdata/location/kubernetes_expected.json поставляемый Normal file

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

104
pkg/acsengine/testdata/location/kubernetes_expected_params.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,104 @@
{
"agentpool1Count": {
"value": 3
},
"agentpool1Subnet": {
"value": "10.240.0.0/16"
},
"agentpool1VMSize": {
"value": "Standard_D2_v2"
},
"agentpool2Count": {
"value": 3
},
"agentpool2Subnet": {
"value": "10.240.0.0/16"
},
"agentpool2VMSize": {
"value": "Standard_D2_v2"
},
"apiServerCertificate": {
"value": "YXBpU2VydmVyQ2VydGlmaWNhdGU="
},
"apiServerPrivateKey": {
"value": "YXBpU2VydmVyUHJpdmF0ZUtleQ=="
},
"caCertificate": {
"value": "Y2FDZXJ0aWZpY2F0ZQ=="
},
"clientCertificate": {
"value": "Y2xpZW50Q2VydGlmaWNhdGU="
},
"clientPrivateKey": {
"value": "Y2xpZW50UHJpdmF0ZUtleQ=="
},
"dockerEngineDownloadRepo": {
"value": "https://apt.dockerproject.org/repo"
},
"firstConsecutiveStaticIP": {
"value": "10.240.255.5"
},
"kubeConfigCertificate": {
"value": "a3ViZUNvbmZpZ0NlcnRpZmljYXRl"
},
"kubeConfigPrivateKey": {
"value": "a3ViZUNvbmZpZ1ByaXZhdGVLZXk="
},
"kubernetesAddonManagerSpec": {
"value": "gcr.io/google_containers/kube-addon-manager-amd64:v6.2"
},
"kubernetesAddonResizerSpec": {
"value": "gcr.io/google_containers/addon-resizer:1.6"
},
"kubernetesDNSMasqSpec": {
"value": "gcr.io/google_containers/kube-dnsmasq-amd64:1.3"
},
"kubernetesDashboardSpec": {
"value": "gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1"
},
"kubernetesExecHealthzSpec": {
"value": "gcr.io/google_containers/exechealthz-amd64:1.2"
},
"kubernetesHeapsterSpec": {
"value": "gcr.io/google_containers/heapster:v1.2.0"
},
"kubernetesHyperkubeSpec": {
"value": "gcr.io/google_containers/hyperkube-amd64:v1.5.3"
},
"kubernetesKubeDNSSpec": {
"value": "gcr.io/google_containers/kubedns-amd64:1.7"
},
"kubernetesPodInfraContainerSpec": {
"value": "gcr.io/google_containers/pause-amd64:3.0"
},
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": "westus"
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},
"masterSubnet": {
"value": "10.240.0.0/16"
},
"masterVMSize": {
"value": "Standard_D2_v2"
},
"networkPolicy": {
"value": "none"
},
"servicePrincipalClientId": {
"value": "ServicePrincipalClientID"
},
"servicePrincipalClientSecret": {
"value": "myServicePrincipalClientSecret"
},
"sshRSAPublicKey": {
"value": "ssh-rsa PUBLICKEY azureuser@linuxvm"
},
"targetEnvironment": {
"value": "AzurePublicCloud"
}
}

42
pkg/acsengine/testdata/location/swarm.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,42 @@
{
"apiVersion": "vlabs",
"location": "centralus",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Swarm"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "masterdns1",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"dnsPrefix": "agentdns1",
"ports": [
80,
443,
8080
]
},
{
"name": "agentpool2",
"count": 3,
"vmSize": "Standard_D2_v2"
}
],
"linuxProfile": {
"adminUsername": "azureuser",
"ssh": {
"publicKeys": [
{
"keyData": "ssh-rsa PUBLICKEY azureuser@linuxvm"
}
]
}
}
}
}

1575
pkg/acsengine/testdata/location/swarm_expected.json поставляемый Normal file

Разница между файлами не показана из-за своего большого размера Загрузить разницу

47
pkg/acsengine/testdata/location/swarm_expected_params.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,47 @@
{
"agentpool1Count": {
"value": 3
},
"agentpool1EndpointDNSNamePrefix": {
"value": "agentdns1"
},
"agentpool1Subnet": {
"value": "10.0.0.0/16"
},
"agentpool1VMSize": {
"value": "Standard_D2_v2"
},
"agentpool2Count": {
"value": 3
},
"agentpool2Subnet": {
"value": "10.1.0.0/16"
},
"agentpool2VMSize": {
"value": "Standard_D2_v2"
},
"firstConsecutiveStaticIP": {
"value": "172.16.0.5"
},
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": "centralus"
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},
"masterSubnet": {
"value": "172.16.0.0/24"
},
"masterVMSize": {
"value": "Standard_D2_v2"
},
"sshRSAPublicKey": {
"value": "ssh-rsa PUBLICKEY azureuser@linuxvm"
},
"targetEnvironment": {
"value": "AzurePublicCloud"
}
}

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -29,6 +29,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -759,6 +759,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -951,7 +958,11 @@
"kubernetesHyperkubeSpec": "[parameters('kubernetesHyperkubeSpec')]",
"kubernetesKubeDNSSpec": "[parameters('kubernetesKubeDNSSpec')]",
"kubernetesPodInfraContainerSpec": "[parameters('kubernetesPodInfraContainerSpec')]",
"location": "[resourceGroup().location]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat('master-availabilityset-', variables('nameSuffix'))]",
"masterCount": 1,
"masterEtcdClientPort": 2379,
@ -1039,7 +1050,7 @@
2204
],
"sshPublicKeyData": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterFqdnPrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -1464,7 +1475,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), copyIndex(variables('agentpool1Offset')),'/cse', copyIndex(variables('agentpool1Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1602,7 +1613,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), copyIndex(variables('agentpool2Offset')),'/cse', copyIndex(variables('agentpool2Offset')))]",
"properties": {
"autoUpgradeMinorVersion": true,
@ -1977,7 +1988,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(),'/cse', copyIndex())]",
"properties": {
"autoUpgradeMinorVersion": true,

Просмотреть файл

@ -74,6 +74,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -597,6 +604,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarm-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 1,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -661,7 +673,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -963,7 +975,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool1VMSize')].storageAccountType]"
@ -972,7 +984,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -987,7 +999,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpool1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1LbName')]",
"properties": {
"backendAddressPools": [
@ -1112,7 +1124,7 @@
"[variables('vnetID')]",
"[variables('agentpool1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1201,7 +1213,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
@ -1219,7 +1231,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1299,7 +1311,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1308,7 +1320,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1343,14 +1355,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1365,7 +1377,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1395,7 +1407,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1413,7 +1425,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1438,7 +1450,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1473,7 +1485,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1536,7 +1548,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -314,6 +314,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterCount": {
"allowedValues": [
1,
@ -560,6 +567,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": "[parameters('masterCount')]",
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -624,7 +636,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -959,7 +971,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentVMSize')].storageAccountType]"
@ -968,7 +980,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentIPAddressName')]",
"properties": {
"dnsSettings": {
@ -983,7 +995,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentLbName')]",
"properties": {
"backendAddressPools": [
@ -1108,7 +1120,7 @@
"[variables('vnetID')]",
"[variables('agentLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1193,7 +1205,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1202,7 +1214,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1230,14 +1242,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1252,7 +1264,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1282,7 +1294,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1300,7 +1312,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1325,7 +1337,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1360,7 +1372,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1423,7 +1435,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -17,6 +17,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterCount": {
"value": 3
},

Просмотреть файл

@ -435,6 +435,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -597,6 +604,11 @@
"clusterInstallParameters": "[concat(variables('masterCount'), ' ',variables('masterVMNamePrefix'), ' ',variables('masterFirstAddrOctet4'), ' ',variables('adminUsername'),' ',variables('postInstallScriptURI'),' ',variables('masterFirstAddrPrefix'))]",
"configureClusterScriptFile": "configure-swarmmode-cluster.sh",
"dataStorageAccountPrefixSeed": 97,
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterCustomScript": "[concat('/bin/bash -c \"/bin/bash /opt/azure/containers/',variables('configureClusterScriptFile'), ' ',variables('clusterInstallParameters'),' >> /var/log/azure/cluster-bootstrap.log 2>&1\"')]",
@ -661,7 +673,7 @@
"postInstallScriptURI": "disabled",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -963,7 +975,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool1StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool1AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool1VMSize')].storageAccountType]"
@ -972,7 +984,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1IPAddressName')]",
"properties": {
"dnsSettings": {
@ -987,7 +999,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpool1IPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpool1LbName')]",
"properties": {
"backendAddressPools": [
@ -1112,7 +1124,7 @@
"[variables('vnetID')]",
"[variables('agentpool1LbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool1VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1201,7 +1213,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpool2VMSize')].storageAccountType]"
@ -1219,7 +1231,7 @@
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountPrefixes')[mod(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpool2StorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpool2AccountName'))]",
"[variables('vnetID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpool2VMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1299,7 +1311,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1308,7 +1320,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1343,14 +1355,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1365,7 +1377,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1395,7 +1407,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1413,7 +1425,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterSshPort22InboundNatRuleNamePrefix'), '0')]",
"properties": {
"backendPort": 2222,
@ -1438,7 +1450,7 @@
"[concat(variables('masterSshPort22InboundNatRuleIdPrefix'),'0')]",
"[concat(variables('masterSshInboundNatRuleIdPrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1473,7 +1485,7 @@
"[concat('Microsoft.Compute/availabilitySets/',variables('masterAvailabilitySet'))]",
"[variables('masterStorageAccountName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1536,7 +1548,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', concat(variables('masterVMNamePrefix'), copyIndex()))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex(), '/configuremaster')]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",

Просмотреть файл

@ -26,6 +26,9 @@
"linuxAdminUsername": {
"value": "azureuser"
},
"location": {
"value": ""
},
"masterEndpointDNSNamePrefix": {
"value": "masterdns1"
},

Просмотреть файл

@ -442,6 +442,13 @@
},
"type": "string"
},
"location": {
"defaultValue": "",
"metadata": {
"description": "Sets the location for all resources in the cluster"
},
"type": "string"
},
"masterEndpointDNSNamePrefix": {
"metadata": {
"description": "Sets the Domain name label for the master IP Address. The concatenation of the domain name label and the regional DNS zone make up the fully qualified domain name associated with the public IP address."
@ -577,6 +584,11 @@
"apiVersionStorage": "2015-06-15",
"dataStorageAccountPrefixSeed": 97,
"dcosBootstrapURL": "[parameters('dcosBootstrapURL')]",
"location": "[variables('locations')[mod(add(2,length(parameters('location'))),add(1,length(parameters('location'))))]]",
"locations": [
"[resourceGroup().location]",
"[parameters('location')]"
],
"masterAvailabilitySet": "[concat(variables('orchestratorName'), '-master-availabilitySet-', variables('nameSuffix'))]",
"masterCount": 3,
"masterEndpointDNSNamePrefix": "[tolower(parameters('masterEndpointDNSNamePrefix'))]",
@ -619,7 +631,7 @@
"osImageVersion": "16.04.201606270",
"sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
"sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),resourceGroup().location, variables('orchestratorName')))]",
"storageAccountBaseName": "[uniqueString(concat(variables('masterEndpointDNSNamePrefix'),variables('location'),variables('orchestratorName')))]",
"storageAccountPrefixes": [
"0",
"6",
@ -915,7 +927,7 @@
"resources": [
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentprivateNSGName')]",
"properties": {
"securityRules": []
@ -931,7 +943,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentprivateVMSize')].storageAccountType]"
@ -948,7 +960,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(3,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentprivateStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentprivateAccountName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentprivateVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1025,7 +1037,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicNSGName')]",
"properties": {
"securityRules": [
@ -1084,7 +1096,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('storageAccountPrefixes')[mod(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(copyIndex(),variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('agentpublicVMSize')].storageAccountType]"
@ -1093,7 +1105,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1108,7 +1120,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('agentpublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('agentpublicLbName')]",
"properties": {
"backendAddressPools": [
@ -1232,7 +1244,7 @@
"[concat('Microsoft.Storage/storageAccounts/',variables('storageAccountPrefixes')[mod(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('storageAccountPrefixes')[div(add(4,variables('agentpublicStorageAccountOffset')),variables('storageAccountPrefixesCount'))],variables('agentpublicAccountName'))]",
"[concat('Microsoft.Network/loadBalancers/', variables('agentpublicLbName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('agentpublicVMNamePrefix'), '-vmss')]",
"properties": {
"upgradePolicy": {
@ -1317,7 +1329,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountName')]",
"properties": {
"accountType": "[variables('vmSizesMap')[variables('masterVMSize')].storageAccountType]"
@ -1329,7 +1341,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterStorageAccountExhibitorName')]",
"properties": {
"accountType": "Standard_LRS"
@ -1342,7 +1354,7 @@
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentprivateNSGName'))]",
"[concat('Microsoft.Network/networkSecurityGroups/', variables('agentpublicNSGName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('virtualNetworkName')]",
"properties": {
"addressSpace": {
@ -1383,14 +1395,14 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterAvailabilitySet')]",
"properties": {},
"type": "Microsoft.Compute/availabilitySets"
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterPublicIPAddressName')]",
"properties": {
"dnsSettings": {
@ -1405,7 +1417,7 @@
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('masterPublicIPAddressName'))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterLbName')]",
"properties": {
"backendAddressPools": [
@ -1435,7 +1447,7 @@
"dependsOn": [
"[variables('masterLbID')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterLbName'), '/', 'SSH-', variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"backendPort": 22,
@ -1450,7 +1462,7 @@
},
{
"apiVersion": "[variables('apiVersionDefault')]",
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[variables('masterNSGName')]",
"properties": {
"securityRules": [
@ -1484,7 +1496,7 @@
"[variables('masterLbID')]",
"[concat(variables('masterLbID'),'/inboundNatRules/SSH-',variables('masterVMNamePrefix'),copyIndex())]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), 'nic-', copyIndex())]",
"properties": {
"ipConfigurations": [
@ -1527,7 +1539,7 @@
"[variables('masterStorageAccountName')]",
"[variables('masterStorageAccountExhibitorName')]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
"properties": {
"availabilitySet": {
@ -1586,7 +1598,7 @@
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', variables('masterVMNamePrefix'), sub(variables('masterCount'), 1))]"
],
"location": "[resourceGroup().location]",
"location": "[variables('location')]",
"name": "[concat(variables('masterVMNamePrefix'), sub(variables('masterCount'), 1), '/waitforleader')]",
"properties": {
"autoUpgradeMinorVersion": true,

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше