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

fixed review comments

Browse Source
This commit is contained in:
Edward Hope-Morley 2014-10-22 22:09:02 +01:00
parent 2dfbc80732
commit ecb0082c62
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.yaml
View File

@ -141,6 +141,7 @@ options:
description: SSL key to use with certificate specified as ssl_cert.
neutron-alchemy-flags:
type: string
default:
description: |
Comma separated list of key=value sqlalchemy related config flags to be
set in plugin ini file.

2
templates/parts/section-database
View File

@ -1,9 +1,9 @@
{% 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 -%}
{% if neutron_alchemy_flags -%}
{% for key, value in neutron_alchemy_flags.iteritems() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}
{% endif -%}