Merge lp:~hopem/charms/trusty/rabbitmq-server/lp1510902 into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

Proposed by Edward Hope-Morley on 2015-10-28
Status: Merged
Merged at revision: 124
Proposed branch: lp:~hopem/charms/trusty/rabbitmq-server/lp1510902
Merge into: lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 12 lines (+2/-1)
1 file modified
hooks/rabbitmq_server_relations.py (+2/-1)
To merge this branch: bzr merge lp:~hopem/charms/trusty/rabbitmq-server/lp1510902
Reviewer Review Type Date Requested Status
David Ames 2015-10-28 Approve on 2015-10-28
Review via email: mp+275980@code.launchpad.net
To post a comment you must log in.

charm_unit_test #11878 rabbitmq-server-next for hopem mp275980
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11878/

charm_lint_check #12795 rabbitmq-server-next for hopem mp275980
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/12795/

charm_amulet_test #7637 rabbitmq-server-next for hopem mp275980
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7637/

David Ames (thedac) wrote :

Looks good.

We really need to setup IPv6 in ServerStack so we can test this more often.

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-10-22 01:25:54 +0000
3+++ hooks/rabbitmq_server_relations.py 2015-10-28 11:34:49 +0000
4@@ -172,7 +172,8 @@
5 # NOTE: active/active case
6 if config('prefer-ipv6'):
7 relation_settings = {'private-address': host_addr}
8- relation_set(relation_settings=relation_settings)
9+ relation_set(relation_id=relation_id,
10+ relation_settings=relation_settings)
11
12 return
13

Subscribers

People subscribed via source and target branches