openstack/charm-ceph
Code Issues Proposed changes

[gnuoy,r=hopem] Fix bug by removing superfluous call to client_relation_changed from client_relation_joined

Browse Source
This commit is contained in:
Liam Young 2015-01-14 10:48:44 +00:00
commit 1ee4265747
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hooks/hooks.py
View File

@ -305,24 +305,21 @@ def client_relation_joined(relid=None):
'ceph-public-address': get_public_addr()}
relation_set(relation_id=relid,
relation_settings=data)
client_relation_changed(relid=relid)
else:
log('mon cluster not in quorum - deferring key provision')
@hooks.hook('client-relation-changed')
def client_relation_changed(relid=None):
def client_relation_changed():
"""Process broker requests from ceph client relations."""
if ceph.is_quorum():
settings = relation_get(rid=relid)
settings = relation_get()
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'])
relation_set(relation_id=relid,
relation_settings={'broker_rsp': rsp})
relation_set(relation_settings={'broker_rsp': rsp})
else:
log('mon cluster not in quorum', level=DEBUG)