From 62925ccad7fe100169c870572550fd8f4fc2046c Mon Sep 17 00:00:00 2001
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Date: Mon, 28 Aug 2017 11:52:29 +0300
Subject: [PATCH] fix JUJU_AVAILABILITY_ZONE usage

juju_availability_zone is not a valid configuration setting, let's use
'rack' instead.

Change-Id: I9ffe609337805a188990c9516fe3e79025694f56
Closes-Bug: #1684330
---
 hooks/ceph_hooks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hooks/ceph_hooks.py b/hooks/ceph_hooks.py
index 3fbc5f8..1184150 100755
--- a/hooks/ceph_hooks.py
+++ b/hooks/ceph_hooks.py
@@ -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