From b64072764baaf170d73807560360054cbf1ba01c Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Mon, 3 Aug 2020 00:33:02 +0200
Subject: [PATCH] [keepalived] Rationalize variable names
---
group_vars/router.yml | 9 ++++++---
host_vars/odlyd.adm.crans.org.yml | 10 +++++-----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/group_vars/router.yml b/group_vars/router.yml
index b9c22199..e9d73843 100644
--- a/group_vars/router.yml
+++ b/group_vars/router.yml
@@ -26,16 +26,19 @@ keepalived:
- vlan: adm
ipv4: 10.231.136.254/24
brd: 10.231.136.255
- - vlan: filpub
+ - vlan: bornes
+ ipv4: 10.231.148.254/24
+ brd: 10.231.148.255
+ - vlan: fil_pub
ipv4: 185.230.78.254/24
brd: 185.230.78.255
- vlan: srv
ipv4: 185.230.79.254/24
brd: 185.230.79.255
- - vlan: filnewserveurs
+ - vlan: fil_new # Nat filaire
ipv4: 10.54.0.254/16
brd: 10.54.255.255
- - vlan: wifinewserveurs
+ - vlan: wifi_new
ipv4: 10.53.0.254/16
brd: 10.53.255.255
- vlan: zayo
diff --git a/host_vars/odlyd.adm.crans.org.yml b/host_vars/odlyd.adm.crans.org.yml
index df7b8574..a5fdba0e 100644
--- a/host_vars/odlyd.adm.crans.org.yml
+++ b/host_vars/odlyd.adm.crans.org.yml
@@ -1,15 +1,15 @@
---
interfaces:
- serveurs: eth0.1
adm: eth0.2
bornes: eth0.3
switches: eth0.4
+ accueil: eth0.7
+ fil_new: ens1f0.21
+ wifi_new: ens1f0.22
+ fil_pub: ens1f0.23
+ srv: ens1f0.24
zayo: ens1f0.26
zrt: ens1f0.1132
- filpub: ens1f0.23
- srv: ens1f0.24
- filnewserveurs: ens1f0.21
- wifinewserveurs: ens1f0.22
keepalived_instances:
- name: radius
--
GitLab