openstack/charm-nova-compute
Code Issues Proposed changes

Fixup kilo configs

Browse Source
This commit is contained in:
James Page 2015-03-24 17:52:45 +00:00
parent 571b0d557a
commit da5f78b827
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.pydevproject
View File

@ -3,7 +3,7 @@
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/nova-compute-charm/hooks</path> <path>/nova-compute/hooks</path>
<path>/nova-compute-charm/unit_tests</path> <path>/nova-compute/unit_tests</path>
</pydev_pathproperty> </pydev_pathproperty>
</pydev_project> </pydev_project>

8
templates/kilo/nova.conf
View File

@ -11,7 +11,6 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
dhcpbridge=/usr/bin/nova-dhcpbridge dhcpbridge=/usr/bin/nova-dhcpbridge
logdir=/var/log/nova logdir=/var/log/nova
state_path=/var/lib/nova state_path=/var/lib/nova
lock_path=/var/lock/nova
force_dhcp_release=True force_dhcp_release=True
verbose=True verbose=True
use_syslog = {{ use_syslog }} use_syslog = {{ use_syslog }}
@ -24,8 +23,6 @@ my_ip = {{ host_ip }}
{% include "parts/database" %} {% include "parts/database" %}
{% include "parts/rabbitmq" %}
{% if console_vnc_type -%} {% if console_vnc_type -%}
vnc_enabled = True vnc_enabled = True
novnc_enabled = True novnc_enabled = True
@ -138,3 +135,8 @@ live_migration_uri = {{ live_migration_uri }}
{% if disk_cachemodes -%} {% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }} disk_cachemodes = {{ disk_cachemodes }}
{% endif -%} {% endif -%}
{% 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 -%}