From 84fb4b906d535861f60a8509cab89b7e5ae026f2 Mon Sep 17 00:00:00 2001 From: Aydin Doyak Date: Thu, 14 Dec 2017 15:48:00 +0300 Subject: [PATCH] Fix use of iteritems in dnsmasq.conf templates. iteritems() method is no longer exists in Python 3 dictionaries which causes the neutron-openvswitch charm to throw an exception if dnsmasq_flags option is set. Code has been changed to items() method to work in Python 3. Change-Id: I7eaae8f33ed0dc5c97ef478bfe9e1fbd7f79783f Closes-Bug: #1738198 --- templates/dnsmasq.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/dnsmasq.conf b/templates/dnsmasq.conf index 9f798b5f..a7d8e928 100644 --- a/templates/dnsmasq.conf +++ b/templates/dnsmasq.conf @@ -1,5 +1,5 @@ {% if dnsmasq_flags -%} -{% for key, value in dnsmasq_flags.iteritems() -%} +{% for key, value in dnsmasq_flags.items() -%} {{ key }} = {{ value }} {% endfor -%} {% endif -%}