openstack/charm-cinder
Code Issues Proposed changes

Switch to using charm-helper templates for rabbitmq

Browse Source
This commit is contained in:
James Page 2015-03-25 09:22:19 +00:00
parent b35c3b083a
commit d04d133bf9
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/kilo/cinder.conf
View File

@ -65,7 +65,7 @@ signing_dir = {{ signing_dir }}
{% include "parts/section-database" %}
{% include "parts/section-rabbitmq" %}
{% include "section-rabbitmq-oslo" %}
[oslo_concurrency]
lock_path = /var/lock/cinder

22
templates/parts/section-rabbitmq
View File

@ -1,22 +0,0 @@
{% if rabbitmq_host or rabbitmq_hosts -%}
[oslo_messaging_rabbit]
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
rabbit_password = {{ rabbitmq_password }}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
rabbit_durable_queues = False
{% endif -%}
{% else -%}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
rabbit_port = {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% endif -%}
{% endif -%}
{% endif -%}