From b43d331390241f16644374e3f8f9abc7f67e9c5e Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 26 Feb 2019 10:55:58 +0100
Subject: [PATCH] Use transport_url for oslo.messaging configuration

Switch to using [DEFAULT]transport_url for configuration of
oslo.messaging connectivity to RabbitMQ.

Use section-oslo-messaging-rabbit to set [oslo_messaging_rabbit]
sectional configuration options for HA and SSL.

Change-Id: Ib0c4d68d76593dc29853354ee2a3815f87789caa
Closes-Bug: 1817672
---
 src/templates/rocky/barbican.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/templates/rocky/barbican.conf b/src/templates/rocky/barbican.conf
index 4170197..287f8a6 100644
--- a/src/templates/rocky/barbican.conf
+++ b/src/templates/rocky/barbican.conf
@@ -4,11 +4,13 @@ bind_host = {{ options.service_listen_info.barbican_worker.ip }}
 bind_port = {{ options.service_listen_info.barbican_worker.port }}
 host_href = {{ options.external_endpoints.barbican_worker.url }}
 
+{% include "parts/section-transport-url" %}
+
 {% include "parts/database" %}
 
 {% include "parts/section-keystone-authtoken" %}
 
-{% include "parts/section-rabbitmq-oslo" %}
+{% include "parts/section-oslo-messaging-rabbit" %}
 
 {% include "parts/section-oslo-middleware" %}