From eb2242f95c38c8c00b1c69cb72d4d159fbfcd6aa Mon Sep 17 00:00:00 2001
From: kbespalov <kbespalov@mirantis.com>
Date: Wed, 30 Nov 2016 21:06:04 +0300
Subject: [PATCH] Messaging multi-backend support

Allow to set backend-related dependencies
and configurations for oslo.messaging.

Change-Id: I8de7f607bd95d7590fbda42090f16931696f5fc6
Depends-On:Ib110af1b9d4feef9085a46518f629e27e8094611
---
 service/cinder-api.yaml      | 3 ++-
 service/files/cinder.conf.j2 | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/service/cinder-api.yaml b/service/cinder-api.yaml
index c228434..64115f8 100644
--- a/service/cinder-api.yaml
+++ b/service/cinder-api.yaml
@@ -101,7 +101,8 @@ service:
           - cinder-conf
         dependencies:
           - memcached
-          - rabbitmq
+          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
+          - "{{ messaging.dependencies[messaging.backend.notifications] }}"
 
 files:
   cinder-conf:
diff --git a/service/files/cinder.conf.j2 b/service/files/cinder.conf.j2
index 9e8e0db..84c1b24 100644
--- a/service/files/cinder.conf.j2
+++ b/service/files/cinder.conf.j2
@@ -22,7 +22,6 @@ nova_catalog_info = compute:nova:internalURL
 glance_catalog_info = image:glance:internalURL
 
 auth_strategy = keystone
-transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq') }}
 
 [database]
 connection = mysql+pymysql://{{ cinder.db.username }}:{{ cinder.db.password }}@{{ address(service.database) }}/{{ cinder.db.name }}
@@ -59,3 +58,7 @@ helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --c
 [oslo_messaging_notifications]
 driver = {{ searchlight.notification_driver }}
 {% endif %}
+
+{# messaging macros template #}
+{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
+{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }}
\ No newline at end of file