openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Resync helpers

This commit is contained in:
James Page 2015-03-12 12:46:54 +00:00
parent bce621cb1e
commit 16d8d2a75c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/charmhelpers/contrib/hahelpers/cluster.py
View File

@ -78,7 +78,10 @@ def is_elected_leader(resource):
try:
return juju_is_leader()
except NotImplementedError:
pass
log('Juju leadership election feature not enabled'
', using fallback support',
level=WARNING)
if is_clustered():
if not is_crm_leader(resource):
log('Deferring action to CRM leader.', level=INFO)

4
hooks/charmhelpers/contrib/peerstorage/__init__.py
View File

@ -59,7 +59,7 @@ def some_hook():
def relation_set(relation_settings=None, relation_id=None, **kwargs):
try:
if not relation_id or (relation_id in relation_ids('cluster')):
if relation_id in relation_ids('cluster'):
return leader_set(settings=relation_settings, **kwargs)
else:
raise NotImplementedError
@ -71,7 +71,7 @@ def relation_set(relation_settings=None, relation_id=None, **kwargs):
def relation_get(attribute=None, rid=None, unit=None):
try:
if not rid or (rid in relation_ids('cluster')):
if rid in relation_ids('cluster'):
return leader_get(attribute)
else:
raise NotImplementedError