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

Fix database parts templates for nova_alchemy_flags. 

This commit uses .keys syntax instead of iterkeys
for fixing a traceback when setting nova_alchemy_flags != None.

Change-Id: I7efcf3f39e7dcd632b3d2a4b7b8f3e8befd7f5de
Closes-Bug: #1828085
This commit is contained in:
Jorge Niedbalski 2019-05-07 12:56:59 -04:00
parent 3f8827b927
commit d491a10a81
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/parts/database-api
View File

@ -2,7 +2,7 @@
{% if nova_api_database_host -%}
connection = {{ nova_api_database_type }}://{{ nova_api_database_user }}:{{ nova_api_database_password }}@{{ nova_api_database_host }}/{{ nova_api_database }}{% if nova_api_database_ssl_ca %}?ssl_ca={{ nova_api_database_ssl_ca }}{% if nova_api_database_ssl_cert %}&ssl_cert={{ nova_api_database_ssl_cert }}&ssl_key={{ nova_api_database_ssl_key }}{% endif %}{% endif %}
{% endif -%}
{% if not nova_alchemy_flags or 'max_pool_size' not in nova_alchemy_flags.iterkeys() -%}
{% if not nova_alchemy_flags or 'max_pool_size' not in nova_alchemy_flags.keys() -%}
max_pool_size = {{ workers }}
{% endif -%}
{% if nova_alchemy_flags -%}

2
templates/parts/database-v2
View File

@ -2,7 +2,7 @@
{% 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() -%}
{% if not nova_alchemy_flags or 'max_pool_size' not in nova_alchemy_flags.keys() -%}
max_pool_size = {{ workers }}
{% endif -%}
{% if nova_alchemy_flags -%}