neutron.conf templates for pythone 3 use iteritems(), should use items()

[Gerd Jakobovitsch]

When updating neutron-api charm to 17.11, an error occurs when config-flags is configured. This happens due to the use of iteritems() instead of items() in neutron.conf templates.

[James Page (james-page)]

neutron-gateway$ fgrep -r iteritems templates/
templates/icehouse/dnsmasq.conf:{% for key, value in dnsmasq_flags.iteritems() -%}

[James Page (james-page)]

neutron-api$ fgrep -r iteritems templates/
templates/api-paste.ini:{% for k, v in m.config.iteritems() -%}
templates/pike/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/juno/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/newton/api-paste.ini:{% for k, v in m.config.iteritems() -%}
templates/newton/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/kilo/api-paste.ini:{% for k, v in m.config.iteritems() -%}
templates/kilo/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/icehouse/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/mitaka/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}
templates/mitaka/api-paste.ini:{% for k, v in m.config.iteritems() -%}
templates/liberty/neutron.conf:{% for key, value in user_config_flags.iteritems() -%}

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/525125

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/525126

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/525125
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-api/commit/?id=b0469d5927184b2b625529ac200944a2848b82c0
Submitter: Zuul
Branch: master

commit b0469d5927184b2b625529ac200944a2848b82c0
Author: James Page <email address hidden>
Date: Mon Dec 4 10:14:36 2017 +0000

    py3: Fix use of iteritems in templates

    Switch to using items for all dictionary iteration.

    Change-Id: I465d0b53c3ff2eeb114b4a7f68ff6b124cb6362b
    Closes-Bug: 1735797

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/525126
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-gateway/commit/?id=eefb27a582c6972bd335331f2729a05abc69566e
Submitter: Zuul
Branch: master

commit eefb27a582c6972bd335331f2729a05abc69566e
Author: James Page <email address hidden>
Date: Mon Dec 4 10:15:55 2017 +0000

    py3: Fix use of iteritems in templates

    Switch to using items for dictionary iteration.

    Change-Id: I5cd7e445e385dd23d5187ef251d8416bdd3db7d4
    Closes-Bug: 1735797

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/17.11
Review: https://review.openstack.org/525208

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/17.11
Review: https://review.openstack.org/525210

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/525210
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-gateway/commit/?id=138f55de7d3cee9fbdf3c053d8eef07c25fa61bb
Submitter: Zuul
Branch: stable/17.11

commit 138f55de7d3cee9fbdf3c053d8eef07c25fa61bb
Author: James Page <email address hidden>
Date: Mon Dec 4 10:15:55 2017 +0000

    py3: Fix use of iteritems in templates

    Switch to using items for dictionary iteration.

    Change-Id: I5cd7e445e385dd23d5187ef251d8416bdd3db7d4
    Closes-Bug: 1735797
    (cherry picked from commit eefb27a582c6972bd335331f2729a05abc69566e)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/525208
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-api/commit/?id=b826fbd9f5805596348602076efb581877d7433e
Submitter: Zuul
Branch: stable/17.11

commit b826fbd9f5805596348602076efb581877d7433e
Author: James Page <email address hidden>
Date: Mon Dec 4 10:14:36 2017 +0000

    py3: Fix use of iteritems in templates

    Switch to using items for all dictionary iteration.

    Change-Id: I465d0b53c3ff2eeb114b4a7f68ff6b124cb6362b
    Closes-Bug: 1735797
    (cherry picked from commit b0469d5927184b2b625529ac200944a2848b82c0)