From 5eaa96452f7158f12d056185aeeaa09b1bd028a1 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 21 Mar 2019 13:10:18 -0400 Subject: [PATCH] python3: s/iteritems/items/ Signed-off-by: Zack Cerza --- roles/common/templates/yum_repo.j2 | 2 +- roles/dhcp-server/templates/dhcpd.conf.j2 | 2 +- roles/dhcp-server/templates/dhcpd.subnet.conf.j2 | 2 +- roles/testnode/templates/yum_repo.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/common/templates/yum_repo.j2 b/roles/common/templates/yum_repo.j2 index d9e2bd0b..7467eb65 100644 --- a/roles/common/templates/yum_repo.j2 +++ b/roles/common/templates/yum_repo.j2 @@ -3,6 +3,6 @@ # [{{ item.key }}] -{% for k, v in item.value.iteritems() | sort -%} +{% for k, v in item.value.items() | sort -%} {{ k }}={{ v }} {% endfor %} diff --git a/roles/dhcp-server/templates/dhcpd.conf.j2 b/roles/dhcp-server/templates/dhcpd.conf.j2 index 26fe1254..5b0c2378 100644 --- a/roles/dhcp-server/templates/dhcpd.conf.j2 +++ b/roles/dhcp-server/templates/dhcpd.conf.j2 @@ -4,6 +4,6 @@ {% endfor %} {% endfor %} -{% for key, value in dhcp_subnets.iteritems() %} +{% for key, value in dhcp_subnets.items() %} include "/etc/dhcp/dhcpd.{{ key }}.conf"; {% endfor %} diff --git a/roles/dhcp-server/templates/dhcpd.subnet.conf.j2 b/roles/dhcp-server/templates/dhcpd.subnet.conf.j2 index f96828c3..c99a9d40 100644 --- a/roles/dhcp-server/templates/dhcpd.subnet.conf.j2 +++ b/roles/dhcp-server/templates/dhcpd.subnet.conf.j2 @@ -1,4 +1,4 @@ -{% for subnet, subnet_item in dhcp_subnets.iteritems() %} +{% for subnet, subnet_item in dhcp_subnets.items() %} {% if subnet == item %} subnet {{ subnet_item.cidr | ipaddr('network') }} netmask {{ subnet_item.cidr | ipaddr('netmask') }} { {% if subnet_item.domain_name is defined -%} diff --git a/roles/testnode/templates/yum_repo.j2 b/roles/testnode/templates/yum_repo.j2 index d9e2bd0b..7467eb65 100644 --- a/roles/testnode/templates/yum_repo.j2 +++ b/roles/testnode/templates/yum_repo.j2 @@ -3,6 +3,6 @@ # [{{ item.key }}] -{% for k, v in item.value.iteritems() | sort -%} +{% for k, v in item.value.items() | sort -%} {{ k }}={{ v }} {% endfor %} -- 2.47.3