From a64f967727b0385334eb47a2bd1789f8cc12b823 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 4 Aug 2021 23:59:39 +0200 Subject: [PATCH] [router] Drop Renater interface, add ENS interconnection Signed-off-by: Yohann D'ANELLO --- group_vars/all/network_interfaces.yml | 5 +++++ group_vars/keepalived.yml | 12 ++++++++---- host_vars/routeur-daniel.adm.crans.org/vars.yml | 8 ++++---- host_vars/routeur-jack.adm.crans.org/vars.yml | 8 ++++---- host_vars/routeur-sam.adm.crans.org/vars.yml | 8 ++++---- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/group_vars/all/network_interfaces.yml b/group_vars/all/network_interfaces.yml index 200f0cda..92a95cb5 100644 --- a/group_vars/all/network_interfaces.yml +++ b/group_vars/all/network_interfaces.yml @@ -30,3 +30,8 @@ glob_network_interfaces: gateway: "{{ query('ldap', 'ip', 'passerelle', 'adh-nat') | ipv4 | first }}" dns: "{{ query('ldap', 'ip', 'passerelle', 'adh-nat') | ipv4 | first }}" gateway_v6: "{{ query('ldap', 'ip', 'passerelle', 'adh-nat') | ipv6 | first }}" + - name: ens + id: 54 + gateway: "{{ query('ldap', 'ip', 'passerelle', 'ens') | ipv4 | first }}" + dns: "{{ query('ldap', 'ip', 'passerelle', 'ens') | ipv4 | first }}" + gateway_v6: "{{ query('ldap', 'ip', 'passerelle', 'ens') | ipv6 | first }}" diff --git a/group_vars/keepalived.yml b/group_vars/keepalived.yml index 8a51d7e8..e4c937d3 100644 --- a/group_vars/keepalived.yml +++ b/group_vars/keepalived.yml @@ -11,6 +11,11 @@ glob_keepalived: ipv6: yes notify: /var/local/services/keepalived/keepalived.py zones: + - vlan: via + ipv4: 138.195.159.250/30 + - vlan: aurore + ipv4: 185.230.79.253/29 + ipv6: 2a0c:700:28::1/64 - vlan: srv ipv4: 185.230.79.62/26 ipv6: 2a0c:700:2::ff:fe00:9902/64 @@ -20,10 +25,9 @@ glob_keepalived: - vlan: adh ipv4: 185.230.78.99/24 ipv6: 2a0c:700:12::ff:fe00:9912/48 - - vlan: aurore - ipv4: 185.230.79.253/29 - brd: no - ipv6: 2a0c:700:28::1/64 + - vlan: ens + ipv4: 100.84.0.99/16 + ipv6: 2a0c:700:54::ff:fe00:9954/48 glob_service_keepalived: name: keepalived diff --git a/host_vars/routeur-daniel.adm.crans.org/vars.yml b/host_vars/routeur-daniel.adm.crans.org/vars.yml index dabb4748..8b24f1a9 100644 --- a/host_vars/routeur-daniel.adm.crans.org/vars.yml +++ b/host_vars/routeur-daniel.adm.crans.org/vars.yml @@ -3,7 +3,7 @@ interfaces: adm: ens18 via: ens19 aurore: ens20 - renater: ens21 - srv: ens22 - srv_nat: ens23 - adh: ens1 + srv: ens21 + srv_nat: ens22 + adh: ens23 + ens: ens1 diff --git a/host_vars/routeur-jack.adm.crans.org/vars.yml b/host_vars/routeur-jack.adm.crans.org/vars.yml index dabb4748..8b24f1a9 100644 --- a/host_vars/routeur-jack.adm.crans.org/vars.yml +++ b/host_vars/routeur-jack.adm.crans.org/vars.yml @@ -3,7 +3,7 @@ interfaces: adm: ens18 via: ens19 aurore: ens20 - renater: ens21 - srv: ens22 - srv_nat: ens23 - adh: ens1 + srv: ens21 + srv_nat: ens22 + adh: ens23 + ens: ens1 diff --git a/host_vars/routeur-sam.adm.crans.org/vars.yml b/host_vars/routeur-sam.adm.crans.org/vars.yml index dabb4748..8b24f1a9 100644 --- a/host_vars/routeur-sam.adm.crans.org/vars.yml +++ b/host_vars/routeur-sam.adm.crans.org/vars.yml @@ -3,7 +3,7 @@ interfaces: adm: ens18 via: ens19 aurore: ens20 - renater: ens21 - srv: ens22 - srv_nat: ens23 - adh: ens1 + srv: ens21 + srv_nat: ens22 + adh: ens23 + ens: ens1