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

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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/

[uosci-testing-bot (uosci-testing-bot)]

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)]

Looks good.

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

review: Approve

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-10-22 01:25:54 +0000
+++ hooks/rabbitmq_server_relations.py	2015-10-28 11:34:49 +0000
@@ -172,7 +172,8 @@
         # NOTE: active/active case
         if config('prefer-ipv6'):
             relation_settings = {'private-address': host_addr}
-            relation_set(relation_settings=relation_settings)
+            relation_set(relation_id=relation_id,
+                         relation_settings=relation_settings)
 
         return