openstack
/
charm-ceph-osd
Code Issues Proposed changes

Merge "fix JUJU_AVAILABILITY_ZONE usage"

This commit is contained in:
Jenkins 2017-08-29 19:06:29 +00:00 committed by Gerrit Code Review
parent 867afa38e1 3c6aec6aca
commit c18632820e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/ceph_hooks.py
View File

@ -191,12 +191,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