openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Created new database section for >= Icehouse since parts/database 

is used for all versions.
This commit is contained in:
Edward Hope-Morley 2015-01-07 12:05:04 +00:00
parent 6440e37b20
commit 24704560ef
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/nova.conf
View File

@ -134,7 +134,7 @@ volume_api_class=nova.volume.cinder.API
{% endfor -%}
{% endif %}
{% include "parts/database" %}
{% include "parts/database-v2" %}
{% if auth_host -%}
[keystone_authtoken]

9
templates/parts/database
View File

@ -1,10 +1,3 @@
[database]
{% if database_host -%}
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 -%}
max_pool_size = {{ workers }}
{% if nova_alchemy_flags -%}
{% for key, value in nova_alchemy_flags.iteritems() -%}
{{ key }} = {{ value }}
{% endfor -%}
sql_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 -%}

12
templates/parts/database-v2 Normal file
View File

@ -0,0 +1,12 @@
[database]
{% if database_host -%}
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 -%}
{% if not nova_alchemy_flags or 'max_pool_size' not in nova_alchemy_flags.iterkeys() -%}
max_pool_size = {{ workers }}
{% endif -%}
{% if nova_alchemy_flags -%}
{% for key, value in nova_alchemy_flags.iteritems() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}