From b0469d5927184b2b625529ac200944a2848b82c0 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 4 Dec 2017 10:14:36 +0000
Subject: [PATCH] py3: Fix use of iteritems in templates

Switch to using items for all dictionary iteration.

Change-Id: I465d0b53c3ff2eeb114b4a7f68ff6b124cb6362b
Closes-Bug: 1735797
---
 templates/api-paste.ini         | 2 +-
 templates/icehouse/neutron.conf | 2 +-
 templates/juno/neutron.conf     | 2 +-
 templates/kilo/api-paste.ini    | 2 +-
 templates/kilo/neutron.conf     | 2 +-
 templates/liberty/neutron.conf  | 2 +-
 templates/mitaka/api-paste.ini  | 2 +-
 templates/mitaka/neutron.conf   | 2 +-
 templates/newton/api-paste.ini  | 2 +-
 templates/newton/neutron.conf   | 2 +-
 templates/pike/neutron.conf     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/api-paste.ini b/templates/api-paste.ini
index 8bc7fb23..5192d578 100644
--- a/templates/api-paste.ini
+++ b/templates/api-paste.ini
@@ -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 -%}
diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index e7b79a07..4f150d85 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -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 -%}
diff --git a/templates/juno/neutron.conf b/templates/juno/neutron.conf
index 2ad2105f..b97f061b 100644
--- a/templates/juno/neutron.conf
+++ b/templates/juno/neutron.conf
@@ -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 -%}
diff --git a/templates/kilo/api-paste.ini b/templates/kilo/api-paste.ini
index 973d0e24..b3e02343 100644
--- a/templates/kilo/api-paste.ini
+++ b/templates/kilo/api-paste.ini
@@ -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 -%}
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index 1c052538..f4b7404f 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -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 -%}
diff --git a/templates/liberty/neutron.conf b/templates/liberty/neutron.conf
index f631d0cc..e9024fd4 100644
--- a/templates/liberty/neutron.conf
+++ b/templates/liberty/neutron.conf
@@ -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 -%}
diff --git a/templates/mitaka/api-paste.ini b/templates/mitaka/api-paste.ini
index 31f57977..6084b662 100644
--- a/templates/mitaka/api-paste.ini
+++ b/templates/mitaka/api-paste.ini
@@ -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 -%}
diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf
index 54497206..fd855508 100644
--- a/templates/mitaka/neutron.conf
+++ b/templates/mitaka/neutron.conf
@@ -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 -%}
diff --git a/templates/newton/api-paste.ini b/templates/newton/api-paste.ini
index eba39515..0773f832 100644
--- a/templates/newton/api-paste.ini
+++ b/templates/newton/api-paste.ini
@@ -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 -%}
diff --git a/templates/newton/neutron.conf b/templates/newton/neutron.conf
index 3e509347..a70569dc 100644
--- a/templates/newton/neutron.conf
+++ b/templates/newton/neutron.conf
@@ -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 -%}
diff --git a/templates/pike/neutron.conf b/templates/pike/neutron.conf
index d9d2f8c4..c51527ba 100644
--- a/templates/pike/neutron.conf
+++ b/templates/pike/neutron.conf
@@ -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 -%}