commit f0bcacdb531779add91e5ffe2de38da2247b891e
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Oct 17 07:01:05 2018 +0000
committer Gerrit Code Review <mail@domain.com> Wed Oct 17 07:01:05 2018 +0000
tree ea8df0cb5c2e9210d3f585f65704475ddf213014
parent fac683135e084a3a250338d14f3ea65b1ffb6235
parent 84d7743b96e085cb3c335dcfe9926c397050f784

Merge "Fix deprecated kombu_ssl options for RMQ"

oslo_templates/files/queens/oslo/messaging/_rabbit.conf

diff --git a/oslo_templates/files/queens/oslo/messaging/_rabbit.conf b/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
index 9924709..4512657 100644
--- a/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
+++ b/oslo_templates/files/queens/oslo/messaging/_rabbit.conf
@@ -28,25 +28,24 @@
 ssl_version = TLSv1_2
   {%- endif %}
   {%- if _data.get('x509',{}).get('enabled', False) %}
-kombu_ssl_ca_certs = {{ _data.x509.ca_file}}
-kombu_ssl_keyfile = {{ _data.x509.key_file}}
-kombu_ssl_certfile = {{ _data.x509.cert_file}}
-  {%- else %}
-
 
 # SSL key file (valid only if SSL enabled). (string value)
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_keyfile
 #ssl_key_file =
+ssl_keyfile = {{ _data.x509.key_file }}
 
 # SSL cert file (valid only if SSL enabled). (string value)
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_certfile
 #ssl_cert_file =
+ssl_certfile = {{ _data.x509.cert_file }}
 
 # SSL certification authority file (valid only if SSL enabled).
 # (string value)
 # Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs
 #ssl_ca_file =
-ssl_ca_certs = {{ _data.ssl.cacert_file }}
+ssl_ca_file = {{ _data.x509.ca_file }}
+  {%- else %}
+ssl_ca_file = {{ _data.ssl.cacert_file }}
   {%- endif %}
 {%- endif %}