openstack/charm-nova-compute
Code Issues Proposed changes

Add sectional database config for kilo

Browse Source
This commit is contained in:
James Page 2015-03-24 17:56:15 +00:00
parent da5f78b827
commit 00827e6177
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/kilo/nova.conf
View File

@ -21,8 +21,6 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
my_ip = {{ host_ip }}
{% include "parts/database" %}
{% if console_vnc_type -%}
vnc_enabled = True
novnc_enabled = True
@ -136,6 +134,8 @@ live_migration_uri = {{ live_migration_uri }}
disk_cachemodes = {{ disk_cachemodes }}
{% endif -%}
{% include "parts/section-database" %}
{% include "parts/section-rabbitmq" %}
[oslo_concurrency]

4
templates/parts/section-database Normal file
View File

@ -0,0 +1,4 @@
{% if database_host -%}
[database]
connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
{% endif -%}