From a89bd0f3891abb5549973f818df2f61df0682c5c Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Fri, 27 Jul 2018 16:54:40 -0400 Subject: [PATCH] update_nrpe_checks() only when nrpe-external-master relation is made Change-Id: I15def3498a5df1876d6e01a192dc209bc732642b Closes-Bug: 1781582 --- hooks/rabbitmq_server_relations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/rabbitmq_server_relations.py b/hooks/rabbitmq_server_relations.py index b45190f6..9c849c1b 100755 --- a/hooks/rabbitmq_server_relations.py +++ b/hooks/rabbitmq_server_relations.py @@ -401,7 +401,7 @@ def cluster_changed(relation_id=None, remote_unit=None): # NOTE(freyes): all the nodes need to marked as 'clustered' (LP: #1691510) rabbit.cluster_with() - if not is_leader(): + if not is_leader() and is_relation_made('nrpe-external-master'): update_nrpe_checks() @@ -804,7 +804,7 @@ def config_changed(): else: log("hacluster relation is present but this node is not active" " skipping update nrpe checks") - else: + elif is_relation_made('nrpe-external-master'): update_nrpe_checks() # Update cluster in case min-cluster-size has changed