From e7c8348f4b884e7958773631c27758482c93f770 Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Mon, 4 Jun 2018 12:36:36 -0400
Subject: [PATCH] Restore rabbit driver ssl config option

The driver option is necessary as the transport_url query param
override requires the value. Default will be to use the oslomsg
rpc setting.

Change-Id: I084a297e9d6e72d47731e18a06539fc00576b143
---
 templates/sahara.conf.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2
index b9d0851..9528119 100644
--- a/templates/sahara.conf.j2
+++ b/templates/sahara.conf.j2
@@ -66,5 +66,8 @@ driver = messagingv2
 transport_url = {{ sahara_oslomsg_notify_transport }}://{% for host in sahara_oslomsg_notify_servers.split(',') %}{{ sahara_oslomsg_notify_userid }}:{{ sahara_oslomsg_notify_password }}@{{ host }}:{{ sahara_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ sahara_oslomsg_notify_vhost }}{% if sahara_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 {% endif %}
 
+[oslo_messaging_rabbit]
+ssl = {{ sahara_oslomsg_rpc_use_ssl }}
+
 [profiler]
 enabled = {{ sahara_profiler_enabled }}