From f57b1f1b3e025609a4a0cea305ac0fb4fcac4927 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 4 Jun 2021 17:14:30 +0200 Subject: [PATCH] network_interfaces is working for my router Signed-off-by: Yohann D'ANELLO --- group_vars/all/network_interfaces.yml | 2 +- host_vars/routeur-templier.adm.ynerant.fr.yml | 5 +++++ plays/network_interfaces.yml | 2 +- .../templates/network/interfaces.d/ifalias.j2 | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 host_vars/routeur-templier.adm.ynerant.fr.yml diff --git a/group_vars/all/network_interfaces.yml b/group_vars/all/network_interfaces.yml index 238dedc..f0d0613 100644 --- a/group_vars/all/network_interfaces.yml +++ b/group_vars/all/network_interfaces.yml @@ -4,7 +4,7 @@ glob_network_interfaces: id: 1 gateway: "185.230.76.62" dns: "{{ query('ldap', 'ip', 'routeur-templier', 'srv') | ipv4 | first }}" - gateway_v6: "2a0c:700:3002::ff:fe02:102" + gateway_v6: "2a0c:700:3012::ff:fe02:112" - name: adm id: 42 dns: "{{ query('ldap', 'ip', 'routeur-templier', 'adm') | ipv4 | first }}" diff --git a/host_vars/routeur-templier.adm.ynerant.fr.yml b/host_vars/routeur-templier.adm.ynerant.fr.yml new file mode 100644 index 0000000..1e0d1a2 --- /dev/null +++ b/host_vars/routeur-templier.adm.ynerant.fr.yml @@ -0,0 +1,5 @@ +--- +interfaces: + adm: ens18 + srv: ens19 + srv_nat: ens20 diff --git a/plays/network_interfaces.yml b/plays/network_interfaces.yml index c6d7fe0..9292d67 100755 --- a/plays/network_interfaces.yml +++ b/plays/network_interfaces.yml @@ -1,6 +1,6 @@ #!/usr/bin/env ansible-playbook --- -- hosts: vm,!routeur +- hosts: vm vars: network_interfaces: "{{ glob_network_interfaces | default({}) | combine(loc_network_interfaces | default({})) }}" roles: diff --git a/roles/network-interfaces/templates/network/interfaces.d/ifalias.j2 b/roles/network-interfaces/templates/network/interfaces.d/ifalias.j2 index 01ef107..37f9bdf 100644 --- a/roles/network-interfaces/templates/network/interfaces.d/ifalias.j2 +++ b/roles/network-interfaces/templates/network/interfaces.d/ifalias.j2 @@ -12,7 +12,7 @@ iface {{ interfaces[item.name] }} inet static {% endfor %} network {{ subnet_network }} netmask {{ subnet_netmask }} -{% if item.gateway is defined %} +{% if item.gateway is defined and item.gateway not in (ips | ipv4) %} gateway {{ item.gateway }} {% endif %} {% if item.metric is defined %} @@ -41,7 +41,7 @@ iface {{ interfaces[item.name] }} inet6 static {% for ip in (ips | ipv6) %} address {{ ip }}/64 {% endfor %} -{% if item.gateway_v6 is defined %} +{% if item.gateway_v6 is defined and item.gateway_v6 not in (ips | ipv6) %} gateway {{ item.gateway_v6 }} {% endif %} accept_ra 0