summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kraynev <skraynev@mirantis.com>2017-02-16 08:53:36 +0000
committerSergey Kraynev <skraynev@mirantis.com>2017-02-16 08:54:47 +0000
commit9e2ceb08ad6408e609fc4f3bcf6a7fcdc16dadf0 (patch)
tree3efd7a7ea451aa6448c725c8dee63eeadfa63bc6
parent86499137004129dd345f45938a03a3d22a7986e5 (diff)
Remove the last usage of the deleted option TLS
Notes
Notes (review): Code-Review+2: Andrey Pavlov <apavlov@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Workflow+1: Proskurin Kirill <kproskurin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 16 Feb 2017 09:17:05 +0000 Reviewed-on: https://review.openstack.org/434749 Project: openstack/fuel-ccp-rabbitmq Branch: refs/heads/master
-rw-r--r--exports/oslo_messaging.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/exports/oslo_messaging.j2 b/exports/oslo_messaging.j2
index 8543cd6..0ff4aff 100644
--- a/exports/oslo_messaging.j2
+++ b/exports/oslo_messaging.j2
@@ -6,7 +6,7 @@
6{%- endif %} 6{%- endif %}
7transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }} 7transport_url=rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
8 8
9{% if security.tls.enabled and rabbitmq.tls.enabled %} 9{% if rabbitmq.tls.enabled %}
10[oslo_messaging_rabbit] 10[oslo_messaging_rabbit]
11kombu_ssl_version="TLSv1_2" 11kombu_ssl_version="TLSv1_2"
12rabbit_use_ssl = true 12rabbit_use_ssl = true