зеркало из https://github.com/Azure/aks-engine.git
fix vnet for DCOS
This commit is contained in:
Родитель
9ebf737cb2
Коммит
3119385670
|
@ -4,7 +4,7 @@
|
|||
},
|
||||
"masterProfile": {
|
||||
"count": 3,
|
||||
"dnsPrefix": "mgmtanhowe1009a",
|
||||
"dnsPrefix": "mgmtanhowe1009i",
|
||||
"vmSize": "Standard_D2_v2"
|
||||
},
|
||||
"agentPoolProfiles": [
|
||||
|
@ -17,7 +17,7 @@
|
|||
"name": "agentpublic",
|
||||
"count": 3,
|
||||
"vmSize": "Standard_D2_v2",
|
||||
"dnsPrefix": "appanhowe1009a",
|
||||
"dnsPrefix": "appanhowe1009i",
|
||||
"ports": [
|
||||
80,
|
||||
443,
|
|
@ -4,7 +4,7 @@
|
|||
},
|
||||
"masterProfile": {
|
||||
"count": 1,
|
||||
"dnsPrefix": "mgmtanhowe0926i",
|
||||
"dnsPrefix": "mgmtanhowe1009g",
|
||||
"vmSize": "Standard_D2_v2"
|
||||
},
|
||||
"agentPoolProfiles": [
|
||||
|
@ -17,7 +17,7 @@
|
|||
"name": "agentpool2",
|
||||
"count": 3,
|
||||
"vmSize": "Standard_D2_v2",
|
||||
"dnsPrefix": "appanhowe0926i",
|
||||
"dnsPrefix": "appanhowe1009g",
|
||||
"ports": [
|
||||
80,
|
||||
443,
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"orchestratorProfile": {
|
||||
"orchestratorType": "DCOS"
|
||||
"orchestratorType": "DCOS184"
|
||||
},
|
||||
"masterProfile": {
|
||||
"count": 5,
|
||||
"dnsPrefix": "mgmtanhowe0926i",
|
||||
"vmSize": "Standard_D2_v2"
|
||||
"count": 3,
|
||||
"dnsPrefix": "mgmtanhowe1009h",
|
||||
"vmSize": "Standard_D2_v2"
|
||||
},
|
||||
"agentPoolProfiles": [
|
||||
{
|
||||
|
@ -17,7 +17,7 @@
|
|||
"name": "agentpublic",
|
||||
"count": 3,
|
||||
"vmSize": "Standard_D2_v2",
|
||||
"dnsPrefix": "appanhowe0926i",
|
||||
"dnsPrefix": "appanhowe1009h",
|
||||
"ports": [
|
||||
80,
|
||||
443,
|
|
@ -3,8 +3,8 @@
|
|||
"orchestratorType": "DCOS"
|
||||
},
|
||||
"masterProfile": {
|
||||
"count": 5,
|
||||
"dnsPrefix": "mgmtanhowe0927h",
|
||||
"count": 3,
|
||||
"dnsPrefix": "mgmtanhowe1009f",
|
||||
"vmSize": "Standard_D2_v2",
|
||||
"vnetSubnetId": "/subscriptions/b52fce95-de5f-4b37-afca-db203a5d0b6a/resourceGroups/anhoweExampleRG/providers/Microsoft.Network/virtualNetworks/ExampleCustomVNET/subnets/ExampleMasterSubnet",
|
||||
"firstConsecutiveStaticIP": "10.100.0.5"
|
||||
|
@ -21,7 +21,7 @@
|
|||
"name": "agentpublic",
|
||||
"count": 3,
|
||||
"vmSize": "Standard_D2_v2",
|
||||
"dnsPrefix": "appanhowe0927h",
|
||||
"dnsPrefix": "appanhowe1009f",
|
||||
"vnetSubnetId": "/subscriptions/b52fce95-de5f-4b37-afca-db203a5d0b6a/resourceGroups/anhoweExampleRG/providers/Microsoft.Network/virtualNetworks/ExampleCustomVNET/subnets/ExampleAgentSubnet",
|
||||
"ports": [
|
||||
80,
|
||||
|
|
|
@ -4,7 +4,7 @@ $RGName=$deployName
|
|||
$SubscriptionId="b52fce95-de5f-4b37-afca-db203a5d0b6a"
|
||||
Set-AzureRmContext -SubscriptionId $SubscriptionId
|
||||
$locName="West US"
|
||||
#$templateFile = "azuredeploy.json"
|
||||
#$templateFile = "azuredeploy.dcos.json"
|
||||
$templateFile = "azuredeploy.kubernetes.json"
|
||||
New-AzureRmResourceGroup -Name $RGName -Location $locName -Force
|
||||
New-AzureRmResourceGroupDeployment -Name $deployName -ResourceGroupName $RGName -TemplateFile $templateFile
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
"name": "nicLoopNode"
|
||||
},
|
||||
"dependsOn": [
|
||||
{{if .IsCustomVNET}}
|
||||
{{if .MasterProfile.IsCustomVNET}}
|
||||
"[variables('masterNSGID')]",
|
||||
{{else}}
|
||||
"[variables('vnetID')]",
|
||||
|
@ -174,7 +174,7 @@
|
|||
}
|
||||
}
|
||||
]
|
||||
{{if .IsCustomVNET}}
|
||||
{{if .MasterProfile.IsCustomVNET}}
|
||||
,"networkSecurityGroup": {
|
||||
"id": "[variables('masterNSGID')]"
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче