openstack/charm-heat
Code Issues Proposed changes

Restore deprecated db config for havana users

Browse Source
This commit is contained in:
James Page 2014-04-15 13:24:23 +01:00
parent 4f1c8afa14
commit 09b62ad8c6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/heat.conf
View File

@ -11,6 +11,11 @@ deferred_auth_method=password
host=heat
auth_encryption_key={{ encryption_key }}
{% if database_host -%}
# < Icehouse db config
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 -%}
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}