Merge lp:~james-page/charms/trusty/rabbitmq-server/bug-1439085 into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[James Page]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-03-30 14:34:35 +0000
+++ hooks/rabbitmq_server_relations.py	2015-04-01 09:42:21 +0000
@@ -301,19 +301,6 @@
     service_restart('rabbitmq-server')
 
 
[e-mail]('cluster-relation-departed')
-def cluster_departed():
-    if is_relation_made('ha') and \
-            config('ha-vip-only') is False:
-        log('hacluster relation is present, skipping native '
-            'rabbitmq cluster config.')
-        return
-    if not is_newer():
-        log('cluster_joined: Relation lesser.')
-        return
-    rabbit.break_cluster()
-
-
 @hooks.hook('ha-relation-joined')
 def ha_joined():
     corosync_bindiface = config('ha-bindiface')