openstack
/
charm-neutron-gateway
Code Issues Proposed changes

Switch to using charm-helper templates for rabbitmq

This commit is contained in:
James Page 2015-03-25 09:22:50 +00:00
parent 66c321149f
commit 415d97a858
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/kilo/neutron.conf
View File

@ -17,7 +17,7 @@ network_device_mtu = {{ network_device_mtu }}
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
{% include "parts/section-rabbitmq" %}
{% include "section-rabbitmq-oslo" %}
[oslo_concurrency]
lock_path = /var/lock/neutron

2
templates/kilo/nova.conf
View File

@ -24,7 +24,7 @@ admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v
service_metadata_proxy=True
metadata_proxy_shared_secret={{ shared_secret }}
{% include "parts/section-rabbitmq" %}
{% include "section-rabbitmq-oslo" %}
[oslo_concurrency]
lock_path=/var/lock/nova

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 -%}