From d695adaf2cb5dbc73a2baa500a27fded5f4da68e Mon Sep 17 00:00:00 2001
From: Kirill Bespalov <kbespalov@mirantis.com>
Date: Wed, 28 Dec 2016 18:30:33 +0300
Subject: [PATCH] Messaging multi-backend support

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

Change-Id: I97133b64aadbb7bd21bea6d01d212b0290330714
---
 service/files/ironic.conf.j2 | 5 +++--
 service/ironic-api.yaml      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/files/ironic.conf.j2 b/service/files/ironic.conf.j2
index 17805c7..ff08c4a 100644
--- a/service/files/ironic.conf.j2
+++ b/service/files/ironic.conf.j2
@@ -5,8 +5,6 @@ use_stderr = true
 
 my_ip = {{ network_topology["private"]["address"] }}
 
-transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
-
 enabled_drivers = {{ ironic.enabled_drivers }}
 
 enabled_network_interfaces = noop,flat
@@ -86,3 +84,6 @@ http_url=http://{{ network_topology["private"]["address"] }}:{{ ironic.ipxe.exte
 
 [ansible]
 use_ramdisk_callback = {{ ironic.ansible.use_ramdisk_callback }}
+
+{# messaging macros template #}
+{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }}
diff --git a/service/ironic-api.yaml b/service/ironic-api.yaml
index 755a3e8..14467ad 100644
--- a/service/ironic-api.yaml
+++ b/service/ironic-api.yaml
@@ -65,7 +65,7 @@ service:
         files:
           - ironic.conf
         dependencies:
-          - rabbitmq
+          - "{{ messaging.dependencies[messaging.backend.rpc] }}"
 files:
   ironic.conf:
     path: /etc/ironic/ironic.conf