Handle ha joined runs out of relation context

ha_relation_joined was being called in the config-changed hook and not
passing relation_id information. Pass relation_id when calling
ha_relation_joined outside of a ha-relation-* hook.

Closes-Bug: #1720353

Change-Id: I529d84c51424cbd9cb9ab0298f97516b37c389d6
This commit is contained in:
Joe Borg 2017-09-29 13:45:40 +01:00 committed by David Ames
parent fa085e2e87
commit 373831a603
1 changed files with 2 additions and 2 deletions

View File

@ -338,9 +338,9 @@ def config_changed():
# (re)install pcmkr agent
install_mysql_ocf()
if relation_ids('ha'):
for rid in relation_ids('ha'):
# make sure all the HA resources are (re)created
ha_relation_joined()
ha_relation_joined(relation_id=rid)
if is_relation_made('nrpe-external-master'):
update_nrpe_config()