From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Wed, 6 Mar 2019 15:42:13 +0000 (+0100)
Subject: nameserver: make named.conf python3 compatible
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F441%2Fhead;p=ceph-cm-ansible.git

nameserver: make named.conf python3 compatible

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
---

diff --git a/roles/nameserver/templates/named.conf.j2 b/roles/nameserver/templates/named.conf.j2
index f850df92..68da3dcb 100644
--- a/roles/nameserver/templates/named.conf.j2
+++ b/roles/nameserver/templates/named.conf.j2
@@ -39,9 +39,9 @@ logging {
 };
 
 # Dynamic DNS
-{% for key, zone in named_domains.iteritems() %}
+{% for key, zone in named_domains.items() %}
 {% if zone.dynamic == true %}
-{% for domain, values in ddns_keys.iteritems() %}
+{% for domain, values in ddns_keys.items() %}
 {% if key == domain %}
 key "{{ key }}" {
 	algorithm hmac-md5;
@@ -53,7 +53,7 @@ key "{{ key }}" {
 {% endfor %}
 
 # Forward zones
-{% for key, zone in named_domains.iteritems() %}
+{% for key, zone in named_domains.items() %}
 zone "{{ key }}" {
 {% if named_conf_slave is defined and named_conf_slave == true %}
 	type	slave;
@@ -74,10 +74,10 @@ zone "{{ key }}" {
 {% endfor %}
 
 # Reverse zones
-{% for key, zone in named_domains.iteritems() %}
+{% for key, zone in named_domains.items() %}
 {% if zone.reverse is defined and zone.reverse.0 is defined %}
 {% for reverse in zone.reverse %}
-{% set octet1,octet2,octet3 = reverse.split('.') %}
+{% set octet1,octet2,octet3,_ = reverse.split('.') %}
 zone "{{ octet3 }}.{{ octet2 }}.{{ octet1 }}.in-addr.arpa" {
 {% if named_conf_slave is defined and named_conf_slave == true %}
 	type	slave;