Merge lp:~niedbalski/charms/precise/rabbitmq-server/trunk into lp:charms/trusty/rabbitmq-server

[Jorge Niedbalski]

- Fixes bug lp:1315034
- Only restarts and updates nrpe checks if the HA relation has been made and
the node is marked as active, otherwise will log a message indicating that the
node is not marked as active.

[Matt Bruzek (mbruzek)]

+1 LGTM I tested this on hp-cloud and all looked well. Unit tests would really be nice for rabbitmq-server because it is hard to set up. Thanks for your work here.

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-09-03 12:33:49 +0000
+++ hooks/rabbitmq_server_relations.py	2014-09-11 22:01:10 +0000
@@ -511,6 +511,10 @@
     open_port(ssl_port)
 
 
+def restart_rabbit_update_nrpe():
+    service_restart('rabbitmq-server')
+    update_nrpe_checks()
+
 @hooks.hook('config-changed')
 def config_changed():
     # Add archive source if provided
@@ -538,11 +542,19 @@
 
     configure_rabbit_ssl()
 
-    if eligible_leader('res_rabbitmq_vip') or \
-       config('ha-vip-only') is True:
-        service_restart('rabbitmq-server')
+    if is_relation_made("ha"):
+        ha_is_active_active = config("ha-vip-only")
 
-    update_nrpe_checks()
+        if ha_is_active_active:
+            restart_rabbit_update_nrpe()
+        else:
+            if eligible_leader('res_rabbitmq_vip'):
+                restart_rabbit_update_nrpe()
+            else:
+                log("hacluster relation is present but this node is not active"
+                    " skipping update nrpe checks")
+    else:
+        restart_rabbit_update_nrpe()
 
 
 def pre_install_hooks():