зеркало из https://github.com/Azure/ARO-RP.git
remove vmssCount parameter
This commit is contained in:
Родитель
044e4cf6aa
Коммит
00e3c59422
|
@ -47,9 +47,6 @@
|
|||
"sshPublicKey": {
|
||||
"value": ""
|
||||
},
|
||||
"vmssCount": {
|
||||
"value": 3
|
||||
},
|
||||
"vmssName": {
|
||||
"value": ""
|
||||
}
|
||||
|
|
|
@ -79,10 +79,6 @@
|
|||
"sshPublicKey": {
|
||||
"type": "string"
|
||||
},
|
||||
"vmssCount": {
|
||||
"type": "int",
|
||||
"defaultValue": 3
|
||||
},
|
||||
"vmssName": {
|
||||
"type": "string"
|
||||
}
|
||||
|
@ -165,7 +161,7 @@
|
|||
"sku": {
|
||||
"name": "Standard_D2s_v3",
|
||||
"tier": "Standard",
|
||||
"capacity": "[parameters('vmssCount')]"
|
||||
"capacity": 3
|
||||
},
|
||||
"properties": {
|
||||
"upgradePolicy": {
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -9,7 +9,6 @@ import (
|
|||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
mgmtcompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
|
||||
|
@ -35,7 +34,6 @@ var apiVersions = map[string]string{
|
|||
}
|
||||
|
||||
const (
|
||||
capacityHack = 12345
|
||||
tenantIDHack = "13805ec3-a223-47ad-ad65-8b2baf92c0fb"
|
||||
)
|
||||
|
||||
|
@ -582,7 +580,7 @@ rm /etc/motd.d/*
|
|||
Sku: &mgmtcompute.Sku{
|
||||
Name: to.StringPtr(string(mgmtcompute.VirtualMachineSizeTypesStandardD2sV3)),
|
||||
Tier: to.StringPtr("Standard"),
|
||||
Capacity: to.Int64Ptr(capacityHack),
|
||||
Capacity: to.Int64Ptr(3),
|
||||
},
|
||||
VirtualMachineScaleSetProperties: &mgmtcompute.VirtualMachineScaleSetProperties{
|
||||
UpgradePolicy: &mgmtcompute.UpgradePolicy{
|
||||
|
@ -1113,7 +1111,6 @@ func (g *generator) template() *arm.Template {
|
|||
"rpImage",
|
||||
"rpImageAuth",
|
||||
"rpMode",
|
||||
"vmssCount",
|
||||
"vmssName",
|
||||
)
|
||||
} else {
|
||||
|
@ -1134,9 +1131,6 @@ func (g *generator) template() *arm.Template {
|
|||
p.Type = "securestring"
|
||||
case "keyvaultPrefix":
|
||||
p.MaxLength = 24 - max(len(kvClusterSuffix), len(kvServiceSuffix))
|
||||
case "vmssCount":
|
||||
p.Type = "int"
|
||||
p.DefaultValue = 3
|
||||
}
|
||||
t.Parameters[param] = p
|
||||
}
|
||||
|
@ -1185,7 +1179,6 @@ func GenerateRPTemplates() error {
|
|||
if i.g.production {
|
||||
b = bytes.Replace(b, []byte(`"accessPolicies": []`), []byte(`"accessPolicies": "[concat(variables('clustersKeyvaultAccessPolicies'), parameters('extraKeyvaultAccessPolicies'))]"`), 1)
|
||||
b = bytes.Replace(b, []byte(`"accessPolicies": []`), []byte(`"accessPolicies": "[concat(variables('serviceKeyvaultAccessPolicies'), parameters('extraKeyvaultAccessPolicies'))]"`), 1)
|
||||
b = bytes.Replace(b, []byte(`"capacity": `+strconv.Itoa(capacityHack)), []byte(`"capacity": "[parameters('vmssCount')]"`), 1)
|
||||
}
|
||||
|
||||
b = append(b, byte('\n'))
|
||||
|
|
Загрузка…
Ссылка в новой задаче