Sync charm-helpers and use "rabbit_use_ssl" for ocata
Ensure "rabbit_use_ssl" is specified in the [oslo_messaging_rabbit] config section instead of "ssl" for Ocata, since "ssl" was not yet introduced. Change-Id: I23bc8d6943377c72811d9b7c544b1ca9e1da9c43 Closes-Bug: #1838696
This commit is contained in:
parent
7b523f82cd
commit
2a1f9a7199
|
@ -0,0 +1,10 @@
|
|||
[oslo_messaging_rabbit]
|
||||
{% if rabbitmq_ha_queues -%}
|
||||
rabbit_ha_queues = True
|
||||
{% endif -%}
|
||||
{% if rabbit_ssl_port -%}
|
||||
rabbit_use_ssl = True
|
||||
{% endif -%}
|
||||
{% if rabbit_ssl_ca -%}
|
||||
ssl_ca_file = {{ rabbit_ssl_ca }}
|
||||
{% endif -%}
|
|
@ -76,4 +76,4 @@ url = {{ gnocchi_url }}
|
|||
|
||||
{% include "section-keystone-authtoken-mitaka" %}
|
||||
|
||||
{% include "section-oslo-messaging-rabbit" %}
|
||||
{% include "section-oslo-messaging-rabbit-ocata" %}
|
||||
|
|
Loading…
Reference in New Issue