diff --git a/templates/etc/bind/named.conf.acl.j2 b/templates/etc/bind/named.conf.acl.j2 index 1cf282b..422fc19 100644 --- a/templates/etc/bind/named.conf.acl.j2 +++ b/templates/etc/bind/named.conf.acl.j2 @@ -1,7 +1,7 @@ // {{ ansible_managed }} {% if bind_named_conf_acl is defined %} -{% for key, content in bind_named_conf_acl.iteritems() %} +{% for key, content in bind_named_conf_acl.items() %} acl "{{ key }}" { {% for line in content.split('\n')[:-1] %} {{ line }} diff --git a/templates/etc/bind/named.conf.keys.j2 b/templates/etc/bind/named.conf.keys.j2 index 68350a3..46e9db5 100644 --- a/templates/etc/bind/named.conf.keys.j2 +++ b/templates/etc/bind/named.conf.keys.j2 @@ -1,7 +1,7 @@ // {{ ansible_managed }} {% if bind_named_conf_keys is defined %} -{% for key_name, key in bind_named_conf_keys.iteritems() | sort %} +{% for key_name, key in bind_named_conf_keys.items() | sort %} key "{{ key_name }}" { algorithm {{ key['algorithm'] }}; secret "{{ key['secret'] }}"; diff --git a/templates/etc/bind/named.conf.local.j2 b/templates/etc/bind/named.conf.local.j2 index b288275..346a9b9 100644 --- a/templates/etc/bind/named.conf.local.j2 +++ b/templates/etc/bind/named.conf.local.j2 @@ -14,15 +14,15 @@ {% endif %} {% if bind_views is defined %} -{% for view, content in bind_views.iteritems() |sort %} +{% for view, content in bind_views.items() |sort %} view "{{ view }}" { -{% for param,value in content.options.iteritems() | sort %} +{% for param,value in content.options.items() | sort %} {{ param }} {{ value }}; {% endfor %} {% if content.zones is defined %} -{% for zone,content in content.zones.iteritems() | sort %} +{% for zone,content in content.zones.items() | sort %} zone "{{ zone }}" { -{% for param,value in content.iteritems() | sort %} +{% for param,value in content.items() | sort %} {{ param }} {{ value }}; {% endfor %} }; @@ -34,9 +34,9 @@ view "{{ view }}" { {% endif %} {% if bind_zones is defined and bind_views is not defined %} -{% for zone, content in bind_zones.iteritems() | sort %} +{% for zone, content in bind_zones.items() | sort %} zone "{{ zone }}" { -{% for param, value in content.iteritems() | sort %} +{% for param, value in content.items() | sort %} {{ param }} {{ value }}; {% endfor %} }; diff --git a/templates/etc/bind/named.conf.logging.j2 b/templates/etc/bind/named.conf.logging.j2 index a4a2fe9..da71167 100644 --- a/templates/etc/bind/named.conf.logging.j2 +++ b/templates/etc/bind/named.conf.logging.j2 @@ -2,7 +2,7 @@ {% if bind_named_conf_logging is defined and bind_named_conf_logging.channels is defined %} logging { -{% for channel, content in bind_named_conf_logging.channels.iteritems() | sort %} +{% for channel, content in bind_named_conf_logging.channels.items() | sort %} channel {{ channel }} { {% for line in content.split('\n') %} {{ line }} @@ -10,7 +10,7 @@ logging { }; {% endfor %} -{% for category, channel in bind_named_conf_logging.categories.iteritems() %} +{% for category, channel in bind_named_conf_logging.categories.items() %} {# Old Style #} {% if channel is string %} category {{ category }} { {{ channel }}; }; diff --git a/templates/etc/bind/named.conf.zones.j2 b/templates/etc/bind/named.conf.zones.j2 index 68cb2af..4fec0a8 100644 --- a/templates/etc/bind/named.conf.zones.j2 +++ b/templates/etc/bind/named.conf.zones.j2 @@ -1,9 +1,9 @@ {% if bind_zones is defined and bind_views is defined %} include "/etc/bind/named.conf.default-zones"; include "/etc/bind/named.conf.revzones"; -{% for zone, content in bind_zones.iteritems() | sort %} +{% for zone, content in bind_zones.items() | sort %} zone "{{ zone }}" { -{% for param, value in content.iteritems() | sort %} +{% for param, value in content.items() | sort %} {{ param }} {{ value }}; {% endfor %} }; diff --git a/templates/var/cache/bind/db.name.zone.j2 b/templates/var/cache/bind/db.name.zone.j2 index 2c10547..5262b3a 100644 --- a/templates/var/cache/bind/db.name.zone.j2 +++ b/templates/var/cache/bind/db.name.zone.j2 @@ -1,7 +1,7 @@ ; {{ ansible_managed }} {% if 'directives' in item.value %} -{% for directive, value in item.value.directives.iteritems() %} +{% for directive, value in item.value.directives.items() %} ${{ directive }} {{ value }} {% endfor %} {% endif %}