From 4727243d0639f77e254d0b5ac57f84c6cea327cf Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <apavlov@mirantis.com>
Date: Mon, 27 Feb 2017 12:52:45 +0000
Subject: [PATCH] Adjust to per-service configuration

Change-Id: I280d2737472e3f1c195d572f8d1c353c18c32598
Depends-On: Ia4d29167cea6dfd19a1970706aafda51a31d5b24
---
 exports/oslo_messaging.j2   | 7 ++++---
 service/files/defaults.yaml | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/exports/oslo_messaging.j2 b/exports/oslo_messaging.j2
index 0ff4aff..04afd3b 100644
--- a/exports/oslo_messaging.j2
+++ b/exports/oslo_messaging.j2
@@ -1,10 +1,11 @@
 {% macro rabbit(cfg_type) -%}
 {% if cfg_type == 'rpc_config' -%}
-  [DEFAULT]
+[DEFAULT]
+transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rpc', rabbitmq.port) }}
 {%- elif cfg_type == 'notifications_config' -%}
-  [oslo_messaging_notifications]
+[oslo_messaging_notifications]
+transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('notifications', rabbitmq.port) }}
 {%- endif %}
-transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
 
 {% if rabbitmq.tls.enabled %}
 [oslo_messaging_rabbit]
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 74261c6..f7a1ee2 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -8,7 +8,6 @@ configs:
   rabbitmq:
     port:
       cont: 5672
-      node: 32672
     password: password
     erlang_cookie: erlang_cookie
     user: rabbitmq