Revert "add juju availability zone to ceph osd location when present"

This reverts commit c94e0b4b0e.

Support for juju provided zones was broken on older Ceph releases
where MAAS zones are not configured (i.e. nothing other than the
default zone).

Backing this change out until we can provide a more complete and
backwards compatible solution.

Closes-Bug: 1570960

Change-Id: I889d556d180d47b54af2991a65efcca09d685332

hooks/ceph_hooks.py

@@ -278,12 +278,6 @@ def install():
     install_upstart_scripts()
 
 
-def az_info():
-    az_info = os.environ.get('JUJU_AVAILABILITY_ZONE')
-    log("AZ Info: " + az_info)
-    return az_info
-
-
 def emit_cephconf():
     mon_hosts = get_mon_hosts()
     log('Monitor hosts are ' + repr(mon_hosts))
@@ -317,10 +311,6 @@ def emit_cephconf():
         cephcontext['public_addr'] = get_public_addr()
         cephcontext['cluster_addr'] = get_cluster_addr()
 
-    if az_info():
-        cephcontext['crush_location'] = "root=default rack={} host={}" \
-            .format(az_info(), socket.gethostname())
-
     # Install ceph.conf as an alternative to support
     # co-existence with other charms that write this file
     charm_ceph_conf = "/var/lib/charm/{}/ceph.conf".format(service_name())

templates/ceph.conf

@@ -29,10 +29,6 @@ public addr = {{ public_addr }}
 cluster addr = {{ cluster_addr }}
 {%- endif %}
 
-{% if crush_location %}
-osd crush location = {{crush_location}}
-{% endif %}
-
 [client.osd-upgrade]
 keyring = /var/lib/ceph/osd/ceph.client.osd-upgrade.keyring