Juju Charms Collection
rabbitmq-server package

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

  1. Trusty Tahr (14.04)
  2. bug-1439085
  3. Merge into next
Proposed by James Page on 2015-04-01
Status: Merged
Merged at revision: 86
Proposed branch: lp:~james-page/charms/trusty/rabbitmq-server/bug-1439085
Merge into: lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 23 lines (+0/-13)
1 file modified
hooks/rabbitmq_server_relations.py (+0/-13)
To merge this branch: bzr merge lp:~james-page/charms/trusty/rabbitmq-server/bug-1439085
Reviewer Review Type Date Requested Status
Liam Young 2015-04-01 Approve on 2015-04-01
Review via email: mp+254882@code.launchpad.net
To post a comment you must log in.
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/rabbitmq_server_relations.py'
2--- hooks/rabbitmq_server_relations.py 2015-03-30 14:34:35 +0000
3+++ hooks/rabbitmq_server_relations.py 2015-04-01 09:42:21 +0000
4@@ -301,19 +301,6 @@
5 service_restart('rabbitmq-server')
6
7
8-@hooks.hook('cluster-relation-departed')
9-def cluster_departed():
10- if is_relation_made('ha') and \
11- config('ha-vip-only') is False:
12- log('hacluster relation is present, skipping native '
13- 'rabbitmq cluster config.')
14- return
15- if not is_newer():
16- log('cluster_joined: Relation lesser.')
17- return
18- rabbit.break_cluster()
19-
20-
21 @hooks.hook('ha-relation-joined')
22 def ha_joined():
23 corosync_bindiface = config('ha-bindiface')

Subscribers

People subscribed via source and target branches