Fixup hooks to restore previous behaviour for non-clustered services

2013-06-06 16:33:12 +01:00 · 2013-06-06 16:33:12 +01:00 · 00e553f620
parent 536a515ddb
commit 00e553f620
2 changed files with 4 additions and 2 deletions
--- a/hooks/rabbitmq_server_relations.py
+++ b/hooks/rabbitmq_server_relations.py
@ -50,9 +50,11 @@ def amqp_changed(relation_id=None, remote_unit=None):
    rabbit.create_vhost(vhost)
    rabbit.create_user(rabbit_user, password)
    rabbit.grant_permissions(rabbit_user, vhost)
+    rabbit_hostname = utils.unit_get('private-address')

    relation_settings = {
-        'password': password
+        'password': password,
+        'hostname': rabbit_hostname
    }
    if cluster.is_clustered():
        relation_settings['clustered'] = 'true'
--- a/2
+++ b/2
@ -1 +1 @@
-94
+95