diff --git a/roles/network-routing/templates/ffmwu-add-ip-rules.sh.j2 b/roles/network-routing/templates/ffmwu-add-ip-rules.sh.j2 index 7dcee4f..ee461f9 100644 --- a/roles/network-routing/templates/ffmwu-add-ip-rules.sh.j2 +++ b/roles/network-routing/templates/ffmwu-add-ip-rules.sh.j2 @@ -60,7 +60,7 @@ ip -6 rule add from all iif {{ mesh.id }}br type unreachable priority 61 {% endfor %} ip -4 rule add from all iif icvpn type unreachable priority 61 ip -4 rule add from all iif {{ ansible_default_ipv4.interface }} type unreachable priority 61 -{% for server_id, server_value in ffrl_exit_server.iteritems() %} +{% for server_id, server_value in ffrl_exit_server.items() %} ip -4 rule add from all iif {{ server_id }} type unreachable priority 61 ip -6 rule add from all iif {{ server_id }} type unreachable priority 61 {% endfor %} diff --git a/roles/network-routing/templates/ffmwu-del-ip-rules.sh.j2 b/roles/network-routing/templates/ffmwu-del-ip-rules.sh.j2 index 8fcfd36..00acaed 100644 --- a/roles/network-routing/templates/ffmwu-del-ip-rules.sh.j2 +++ b/roles/network-routing/templates/ffmwu-del-ip-rules.sh.j2 @@ -60,7 +60,7 @@ ip -6 rule del from all iif {{ mesh.id }}br type unreachable priority 61 {% endfor %} ip -4 rule del from all iif icvpn type unreachable priority 61 ip -4 rule del from all iif {{ ansible_default_ipv4.interface }} type unreachable priority 61 -{% for server_id, server_value in ffrl_exit_server.iteritems() %} +{% for server_id, server_value in ffrl_exit_server.items() %} ip -4 rule del from all iif {{ server_id }} type unreachable priority 61 ip -6 rule del from all iif {{ server_id }} type unreachable priority 61 {% endfor %} diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 index c20abc7..2c16cd7 100644 --- a/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 +++ b/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 @@ -18,7 +18,7 @@ function is_ffrl_nat() { function is_ffrl_tunnel_nets() { return net ~ [ -{% for peer_id, peer_value in ffrl_exit_server.iteritems() %} +{% for peer_id, peer_value in ffrl_exit_server.items() %} {{ peer_value.tunnel_ipv4_network }}{{ "," if not loop.last else "" }} {% endfor %} ]; diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 index 5f6f1fb..4403306 100644 --- a/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 +++ b/roles/service-bird-ffrl/templates/ffrl_ipv4_peers.conf.j2 @@ -2,7 +2,7 @@ # {{ ansible_managed }} # -{% for peer_id, peer_value in ffrl_exit_server.iteritems() %} +{% for peer_id, peer_value in ffrl_exit_server.items() %} protocol bgp '{{ peer_id }}' from ffrl_uplink { source address {{ peer_value.tunnel_ipv4_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }}; neighbor {{ peer_value.tunnel_ipv4_network | ipaddr('net') | ipaddr('address') }} as ffrl_as; diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2 index 57ed1d4..e5263a6 100644 --- a/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2 +++ b/roles/service-bird-ffrl/templates/ffrl_ipv6.conf.j2 @@ -20,7 +20,7 @@ function is_ffrl_public_nets() { function is_ffrl_tunnel_nets() { return net ~ [ -{% for peer_id, peer_value in ffrl_exit_server.iteritems() %} +{% for peer_id, peer_value in ffrl_exit_server.items() %} {{ peer_value.tunnel_ipv6_network }}{{ "," if not loop.last else "" }} {% endfor %} ]; diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 index ef495ed..cae7201 100644 --- a/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 +++ b/roles/service-bird-ffrl/templates/ffrl_ipv6_peers.conf.j2 @@ -2,7 +2,7 @@ # {{ ansible_managed }} # -{% for peer_id, peer_value in ffrl_exit_server.iteritems() %} +{% for peer_id, peer_value in ffrl_exit_server.items() %} protocol bgp '{{ peer_id }}' from ffrl_uplink { source address {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('address') }}; neighbor {{ peer_value.tunnel_ipv6_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }} as ffrl_as; diff --git a/roles/service-bird/templates/mwu_ipv4_peers.conf.j2 b/roles/service-bird/templates/mwu_ipv4_peers.conf.j2 index c581ab5..e5c3077 100644 --- a/roles/service-bird/templates/mwu_ipv4_peers.conf.j2 +++ b/roles/service-bird/templates/mwu_ipv4_peers.conf.j2 @@ -10,7 +10,7 @@ protocol bgp mwu_{{ gateway.rsplit('.freifunk-mwu.de')[0] }} from ibgp_mwu { {% endif %} {% endfor %} -{% for item, value in bgp_mwu_servers.iteritems() %} +{% for item, value in bgp_mwu_servers.items() %} {% if item != inventory_hostname_short %} protocol bgp mwu_{{ item }} from ibgp_mwu { neighbor {{ value.ipv4 }} as mwu_as; diff --git a/roles/service-bird/templates/mwu_ipv6_peers.conf.j2 b/roles/service-bird/templates/mwu_ipv6_peers.conf.j2 index 4c20b08..44f8c6a 100644 --- a/roles/service-bird/templates/mwu_ipv6_peers.conf.j2 +++ b/roles/service-bird/templates/mwu_ipv6_peers.conf.j2 @@ -10,7 +10,7 @@ protocol bgp mwu_{{ gateway.rsplit('.freifunk-mwu.de')[0] }} from ibgp_mwu { {% endif %} {% endfor %} -{% for item, value in bgp_mwu_servers.iteritems() %} +{% for item, value in bgp_mwu_servers.items() %} {% if item != inventory_hostname_short %} protocol bgp mwu_{{ item }} from ibgp_mwu { neighbor {{ value.ipv6 }} as mwu_as; diff --git a/roles/service-prometheus/templates/prometheus.yml.j2 b/roles/service-prometheus/templates/prometheus.yml.j2 index 93a3eb0..6c6972d 100644 --- a/roles/service-prometheus/templates/prometheus.yml.j2 +++ b/roles/service-prometheus/templates/prometheus.yml.j2 @@ -11,7 +11,7 @@ global: {% if prometheus_rule_files is defined %} # Rule files specifies a list of files from which rules are read. rule_files: - {% for (key, value) in prometheus_rule_files.iteritems() %} + {% for (key, value) in prometheus_rule_files.items() %} - {{ prometheus_rule_path }}/{{ value.dest }} {% endfor %} {% endif %}