From dccddee22fc541234fae4799003d66f72d78e666 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Fri, 1 Mar 2013 17:23:16 -0800
Subject: [PATCH] Stop rabbitmq brefore setting node-name.

---
 hooks/rabbitmq-server-relations.py | 3 +++
 revision                           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hooks/rabbitmq-server-relations.py b/hooks/rabbitmq-server-relations.py
index 8beed115..8c12b1ef 100755
--- a/hooks/rabbitmq-server-relations.py
+++ b/hooks/rabbitmq-server-relations.py
@@ -118,6 +118,9 @@ def ha_joined():
         return
 
     # rabbit node-name need to match on all nodes.
+    if utils.running('rabbitmq-server'):
+        utils.juju_log('INFO','Stopping rabbitmq-server.')
+        utils.stop('rabbitmq-server')
     with open('/etc/rabbitmq/rabbitmq.conf.d/node-name', 'wb') as out:
         out.write('RABBITMQ_NODENAME=%s@localhost' % SERVICE_NAME)
 
diff --git a/revision b/revision
index fff0a247..78eb67ce 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-74
+75