From 9e263ee31bbfcac69873cd23f7aaa1e81d5ce5d3 Mon Sep 17 00:00:00 2001 From: Benjamin Graillot Date: Tue, 21 Apr 2020 09:57:02 +0200 Subject: [PATCH] [interfaces] Change interfaces.fact format --- .../templates/network/interfaces.d/00-srv.j2 | 12 ++++++------ .../templates/network/interfaces.d/01-ens.j2 | 12 ++++++------ .../templates/network/interfaces.d/02-adm.j2 | 12 ++++++------ .../templates/network/interfaces.d/21-fil.j2 | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/roles/interfaces/templates/network/interfaces.d/00-srv.j2 b/roles/interfaces/templates/network/interfaces.d/00-srv.j2 index 1367d156..9e934d98 100644 --- a/roles/interfaces/templates/network/interfaces.d/00-srv.j2 +++ b/roles/interfaces/templates/network/interfaces.d/00-srv.j2 @@ -12,9 +12,9 @@ iface {{ srv_iface.stdout }} inet static dns-search crans.org up /sbin/ip link set $IFACE alias srv {% if 'interfaces' in ansible_local %} -{% if srv_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_4' in ansible_local.interfaces[srv_iface.stdout] %} -{% for line in ansible_local.interfaces[srv_iface.stdout].sup_if_4 %} +{% if 'sup_if_4' in ansible_local.interfaces %} +{% if srv_iface.stdout in ansible_local.interfaces.sup_if_4 %} +{% for line in ansible_local.interfaces.sup_if_4[srv_iface.stdout] %} {{ line }} {% endfor %} {% endif %} @@ -27,9 +27,9 @@ iface {{ srv_iface.stdout }} inet6 static accept_ra 2 up /sbin/sysctl net/ipv6/conf/$IFACE/accept_ra_defrtr=1 {% if 'interfaces' in ansible_local %} -{% if srv_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_6' in ansible_local.interfaces[srv_iface.stdout] %} -{% for line in ansible_local.interfaces[srv_iface.stdout].sup_if_6 %} +{% if 'sup_if_6' in ansible_local.interfaces %} +{% if srv_iface.stdout in ansible_local.interfaces.sup_if_6 %} +{% for line in ansible_local.interfaces.sup_if_6[srv_iface.stdout] %} {{ line }} {% endfor %} {% endif %} diff --git a/roles/interfaces/templates/network/interfaces.d/01-ens.j2 b/roles/interfaces/templates/network/interfaces.d/01-ens.j2 index e94243b1..ac2bed20 100644 --- a/roles/interfaces/templates/network/interfaces.d/01-ens.j2 +++ b/roles/interfaces/templates/network/interfaces.d/01-ens.j2 @@ -12,9 +12,9 @@ iface {{ ens_iface.stdout }} inet static dns-search crans.org up /sbin/ip link set $IFACE alias ens {% if 'interfaces' in ansible_local %} -{% if ens_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_4' in ansible_local.interfaces[ens_iface.stdout] %} -{% for line in ansible_local.interfaces[ens_iface.stdout].sup_if_4 %} +{% if 'sup_if_4' in ansible_local.interfaces %} +{% if ens_iface.stdout in ansible_local.interfaces.sup_if_4 %} +{% for line in ansible_local.interfaces.sup_if_4[ens_iface.stdout] %} {{ line }} {% endfor %} {% endif %} @@ -27,9 +27,9 @@ iface {{ ens_iface.stdout }} inet6 static accept_ra 2 up /sbin/sysctl net/ipv6/conf/$IFACE/accept_ra_defrtr=1 {% if 'interfaces' in ansible_local %} -{% if ens_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_6' in ansible_local.interfaces[ens_iface.stdout] %} -{% for line in ansible_local.interfaces[ens_iface.stdout].sup_if_6 %} +{% if 'sup_if_6' in ansible_local.interfaces %} +{% if ens_iface.stdout in ansible_local.interfaces.sup_if_6 %} +{% for line in ansible_local.interfaces.sup_if_6[ens_iface.stdout] %} {{ line }} {% endfor %} {% endif %} diff --git a/roles/interfaces/templates/network/interfaces.d/02-adm.j2 b/roles/interfaces/templates/network/interfaces.d/02-adm.j2 index bd928eae..dce7c3e4 100644 --- a/roles/interfaces/templates/network/interfaces.d/02-adm.j2 +++ b/roles/interfaces/templates/network/interfaces.d/02-adm.j2 @@ -11,9 +11,9 @@ iface {{ adm_iface.stdout }} inet static dns-search adm.crans.org up /sbin/ip link set $IFACE alias adm {% if 'interfaces' in ansible_local %} -{% if adm_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_4' in ansible_local.interfaces[adm_iface.stdout] %} -{% for line in ansible_local.interfaces[adm_iface.stdout].sup_if_4 %} +{% if 'sup_if_4' in ansible_local.interfaces %} +{% if adm_iface.stdout in ansible_local.interfaces.sup_if_4 %} +{% for line in ansible_local.interfaces.sup_if_4[adm_iface.stdout] %} {{ line }} {% endfor %} {% endif %} @@ -23,9 +23,9 @@ iface {{ adm_iface.stdout }} inet static iface {{ adm_iface.stdout }} inet6 static address {{ hostvars[inventory_hostname]['ansible_' + adm_iface.stdout].ipv6[0].address }}/{{ hostvars[inventory_hostname]['ansible_' + adm_iface.stdout].ipv6[0].prefix }} {% if 'interfaces' in ansible_local %} -{% if adm_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_6' in ansible_local.interfaces[adm_iface.stdout] %} -{% for line in ansible_local.interfaces[adm_iface.stdout].sup_if_6 %} +{% if 'sup_if_6' in ansible_local.interfaces %} +{% if adm_iface.stdout in ansible_local.interfaces.sup_if_6 %} +{% for line in ansible_local.interfaces.sup_if_6[adm_iface.stdout] %} {{ line }} {% endfor %} {% endif %} diff --git a/roles/interfaces/templates/network/interfaces.d/21-fil.j2 b/roles/interfaces/templates/network/interfaces.d/21-fil.j2 index 469f0531..f9453e0f 100644 --- a/roles/interfaces/templates/network/interfaces.d/21-fil.j2 +++ b/roles/interfaces/templates/network/interfaces.d/21-fil.j2 @@ -12,9 +12,9 @@ iface {{ fil_iface.stdout }} inet static dns-search fil.crans.org up /sbin/ip link set $IFACE alias fil {% if 'interfaces' in ansible_local %} -{% if fil_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_4' in ansible_local.interfaces[fil_iface.stdout] %} -{% for line in ansible_local.interfaces[fil_iface.stdout].sup_if_4 %} +{% if 'sup_if_4' in ansible_local.interfaces %} +{% if fil_iface.stdout in ansible_local.interfaces.sup_if_4 %} +{% for line in ansible_local.interfaces.sup_if_4[fil_iface.stdout] %} {{ line }} {% endfor %} {% endif %} @@ -24,9 +24,9 @@ iface {{ fil_iface.stdout }} inet static iface {{ fil_iface.stdout }} inet6 static address {{ hostvars[inventory_hostname]['ansible_' + fil_iface.stdout].ipv6[0].address }}/{{ hostvars[inventory_hostname]['ansible_' + fil_iface.stdout].ipv6[0].prefix }} {% if 'interfaces' in ansible_local %} -{% if fil_iface.stdout in ansible_local.interfaces %} -{% if 'sup_if_6' in ansible_local.interfaces[fil_iface.stdout] %} -{% for line in ansible_local.interfaces[fil_iface.stdout].sup_if_6 %} +{% if 'sup_if_6' in ansible_local.interfaces %} +{% if fil_iface.stdout in ansible_local.interfaces.sup_if_6 %} +{% for line in ansible_local.interfaces.sup_if_6[fil_iface.stdout] %} {{ line }} {% endfor %} {% endif %}