Merge "fix JUJU_AVAILABILITY_ZONE usage"
This commit is contained in:
commit
b205ab3283
|
@ -152,12 +152,12 @@ def install():
|
|||
|
||||
def az_info():
|
||||
az_info = ""
|
||||
config_az = config("availability_zone")
|
||||
juju_az_info = os.environ.get('JUJU_AVAILABILITY_ZONE')
|
||||
if juju_az_info:
|
||||
az_info = "{} juju_availability_zone={}".format(az_info, juju_az_info)
|
||||
config_az = config("availability_zone")
|
||||
az_info = "{} rack={}".format(az_info, juju_az_info)
|
||||
if config_az:
|
||||
az_info = "{} config_availability_zone={}".format(az_info, config_az)
|
||||
az_info = "{} row={}".format(az_info, config_az)
|
||||
if az_info != "":
|
||||
log("AZ Info: " + az_info)
|
||||
return az_info
|
||||
|
|
Loading…
Reference in New Issue