openstack/charm-neutron-gateway
Code Issues Proposed changes

Fixup nova template for SSL rabbitmq

Browse Source
This commit is contained in:
James Page 2014-03-29 09:51:25 +00:00
parent b00f44a378
commit 5c831e1261
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/grizzly/nova.conf
View File

@ -12,18 +12,25 @@ quantum_metadata_proxy_shared_secret={{ shared_secret }}
service_quantum_metadata_proxy=True
# Access to message bus
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid={{ rabbitmq_user }}
rabbit_virtual_host={{ rabbitmq_virtual_host }}
rabbit_password={{ rabbitmq_password }}
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 %}
{% 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 -%}
# Access to quantum API services
network_api_class=nova.network.quantumv2.api.API

17
templates/havana/nova.conf
View File

@ -12,18 +12,25 @@ neutron_metadata_proxy_shared_secret={{ shared_secret }}
service_neutron_metadata_proxy=True
# Access to message bus
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid={{ rabbitmq_user }}
rabbit_virtual_host={{ rabbitmq_virtual_host }}
rabbit_password={{ rabbitmq_password }}
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 %}
{% 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 -%}
# Access to neutron API services
network_api_class=nova.network.neutronv2.api.API