openstack/charm-neutron-api
Code Issues Proposed changes

py3: Fix use of iteritems in templates

Browse Source 
Switch to using items for all dictionary iteration.

Change-Id: I465d0b53c3ff2eeb114b4a7f68ff6b124cb6362b
Closes-Bug: 1735797
This commit is contained in:
James Page 2017-12-04 10:14:36 +00:00
parent e16f7063e0
commit b0469d5927
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/api-paste.ini
View File

@ -10,7 +10,7 @@ keystone = {% for m in extra_middleware %}{{ m.name }} {% endfor %}request_id ca
{% for m in extra_middleware -%}
[{{ m.type }}:{{ m.name }}]
{% for k, v in m.config.iteritems() -%}
{% for k, v in m.config.items() -%}
{{ k }} = {{ v }}
{% endfor %}
{% endfor -%}

2
templates/icehouse/neutron.conf
View File

@ -67,7 +67,7 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/juno/neutron.conf
View File

@ -71,7 +71,7 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/kilo/api-paste.ini
View File

@ -10,7 +10,7 @@ keystone = {% for m in extra_middleware %}{{ m.name }} {% endfor %}request_id ca
{% for m in extra_middleware -%}
[{{ m.type }}:{{ m.name }}]
{% for k, v in m.config.iteritems() -%}
{% for k, v in m.config.items() -%}
{{ k }} = {{ v }}
{% endfor %}
{% endfor -%}

2
templates/kilo/neutron.conf
View File

@ -69,7 +69,7 @@ nova_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/liberty/neutron.conf
View File

@ -64,7 +64,7 @@ notify_nova_on_port_data_changes = True
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/mitaka/api-paste.ini
View File

@ -10,7 +10,7 @@ keystone = {% for m in extra_middleware %}{{ m.name }} {% endfor %}cors request_
{% for m in extra_middleware -%}
[{{ m.type }}:{{ m.name }}]
{% for k, v in m.config.iteritems() -%}
{% for k, v in m.config.items() -%}
{{ k }} = {{ v }}
{% endfor %}
{% endfor -%}

2
templates/mitaka/neutron.conf
View File

@ -60,7 +60,7 @@ notify_nova_on_port_data_changes = True
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/newton/api-paste.ini
View File

@ -10,7 +10,7 @@ keystone = {% for m in extra_middleware %}{{ m.name }} {% endfor %}cors http_pro
{% for m in extra_middleware -%}
[{{ m.type }}:{{ m.name }}]
{% for k, v in m.config.iteritems() -%}
{% for k, v in m.config.items() -%}
{{ k }} = {{ v }}
{% endfor %}
{% endfor -%}

2
templates/newton/neutron.conf
View File

@ -60,7 +60,7 @@ notify_nova_on_port_data_changes = True
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}

2
templates/pike/neutron.conf
View File

@ -60,7 +60,7 @@ notify_nova_on_port_data_changes = True
{% endif %}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{% for key, value in user_config_flags.items() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}