Skip to content

Commit

Permalink
adding francecentral to azureconst generative script (Azure#2164)
Browse files Browse the repository at this point in the history
  • Loading branch information
serbrech authored and Terje Torkelsen committed Mar 15, 2018
1 parent 143ba11 commit 341e14f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/acsengine/Get-AzureConstants.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
time = strftime("%Y-%m-%d %H:%M:%S", gmtime())

def getAllSizes():
locations = json.loads(subprocess.check_output(['az', 'account', 'list-locations']))
locations = json.loads(subprocess.check_output(['az', 'account', 'list-locations']).decode('utf-8'))
sizeMap = {}

for location in locations:
sizes = json.loads(subprocess.check_output(['az', 'vm', 'list-sizes', '-l', location['name']]))
sizes = json.loads(subprocess.check_output(['az', 'vm', 'list-sizes', '-l', location['name']]).decode('utf-8'))
for size in sizes:
if not size['name'] in sizeMap and not size['name'].split('_')[0] == 'Basic':
sizeMap[size['name']] = size
Expand Down Expand Up @@ -43,7 +43,7 @@ def getMasterAgentMap(sizeMap):
return agentMap

def getLocations():
locations = json.loads(subprocess.check_output(['az', 'account', 'list-locations']))
locations = json.loads(subprocess.check_output(['az', 'account', 'list-locations']).decode('utf-8'))

locationList = [l['name'] for l in locations]

Expand Down Expand Up @@ -87,6 +87,7 @@ def getFileContents(dcosMasterMap, masterAgentMap, kubernetesAgentMap, sizeMap,
"usgoviowa",
"usgovarizona",
"usgovtexas",
"francecentral",
}
// GetDCOSMasterAllowedSizes returns the master allowed sizes
Expand Down

0 comments on commit 341e14f

Please sign in to comment.