Merge lp:~gnuoy/charms/trusty/ceph/1517940 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #731 ceph-next for gnuoy mp286278
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/731/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #638 ceph-next for gnuoy mp286278
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/638/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #285 ceph-next for gnuoy mp286278
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/285/

=== modified file 'hooks/ceph.py'
--- hooks/ceph.py	2016-01-12 14:17:36 +0000
+++ hooks/ceph.py	2016-02-17 10:41:27 +0000
@@ -145,6 +145,7 @@
 
 def wait_for_quorum():
     while not is_quorum():
+        log("Waiting for quorum to be reached")
         time.sleep(3)
 
 
 
=== modified file 'hooks/ceph_hooks.py'
--- hooks/ceph_hooks.py	2016-02-02 17:01:53 +0000
+++ hooks/ceph_hooks.py	2016-02-17 10:41:27 +0000
@@ -266,6 +266,7 @@
             ceph.osdize(dev, config('osd-format'), get_osd_journal(),
                         reformat_osd(), config('ignore-device-errors'))
         ceph.start_osds(get_devices())
+        ceph.wait_for_quorum()
         notify_osds()
         notify_radosgws()
         notify_client()
@@ -281,7 +282,8 @@
 
 def notify_radosgws():
     for relid in relation_ids('radosgw'):
-        radosgw_relation(relid)
+        for unit in related_units(relid):
+            radosgw_relation(relid=relid, unit=unit)
 
 
 def notify_client():
@@ -320,19 +322,20 @@
 
 @hooks.hook('radosgw-relation-changed')
 @hooks.hook('radosgw-relation-joined')
-def radosgw_relation(relid=None):
+def radosgw_relation(relid=None, unit=None):
     # Install radosgw for admin tools
     apt_install(packages=filter_installed_packages(['radosgw']))
-
+    if not unit:
+        unit = remote_unit()
     """Process broker request(s)."""
     if ceph.is_quorum():
-        settings = relation_get(rid=relid)
+        settings = relation_get(rid=relid, unit=unit)
         if 'broker_req' in settings:
             if not ceph.is_leader():
                 log("Not leader - ignoring broker request", level=DEBUG)
             else:
                 rsp = process_requests(settings['broker_req'])
-                unit_id = remote_unit().replace('/', '-')
+                unit_id = unit.replace('/', '-')
                 unit_response_key = 'broker-rsp-' + unit_id
                 log('mon cluster in quorum - providing radosgw with keys')
                 data = {