openstack/charm-neutron-gateway
Code Issues Proposed changes

Fixup nova conf for kilo

Browse Source
This commit is contained in:
James Page 2015-03-24 17:20:26 +00:00
parent 391d84d3e3
commit 33419fec1d
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/kilo/nova.conf
View File

@ -6,16 +6,12 @@
[DEFAULT] [DEFAULT]
logdir=/var/log/nova logdir=/var/log/nova
state_path=/var/lib/nova state_path=/var/lib/nova
lock_path=/var/lock/nova
root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
verbose= {{ verbose }} verbose= {{ verbose }}
use_syslog = {{ use_syslog }} use_syslog = {{ use_syslog }}
api_paste_config=/etc/nova/api-paste.ini api_paste_config=/etc/nova/api-paste.ini
enabled_apis=metadata enabled_apis=metadata
multi_host=True multi_host=True
{% include "parts/database" %}
# Access to message bus
{% include "parts/rabbitmq" %}
# Access to neutron API services # Access to neutron API services
network_api_class=nova.network.neutronv2.api.API network_api_class=nova.network.neutronv2.api.API
[neutron] [neutron]
@ -27,3 +23,8 @@ admin_password={{ service_password }}
admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
service_metadata_proxy=True service_metadata_proxy=True
metadata_proxy_shared_secret={{ shared_secret }} metadata_proxy_shared_secret={{ shared_secret }}
{% include "parts/section-rabbitmq" %}
[oslo_concurrency]
lock_path=/var/lock/nova

22
templates/parts/section-rabbitmq Normal file
View File

@ -0,0 +1,22 @@
{% 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 -%}