f-70: lab: segment lan et br-lan pour le mode bridge, backend dnsmasq explicite #70

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-17 19:19:24 +02:00
commit 36acd7da06
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
5 changed files with 38 additions and 11 deletions

View file

@ -4,3 +4,7 @@ bgp:
watchdog:
enabled: true
interval_seconds: 10
dhcp:
backend: dnsmasq
interfaces:
lan: br-lan

View file

@ -6,3 +6,5 @@ bgp:
watchdog:
enabled: true
interval_seconds: 10
interfaces:
lan: br-lan

View file

@ -10,6 +10,9 @@ segments:
routers: [sw1, sw2]
cidr: 192.168.14.0/24
mtu: 9000
lan:
cidr: 10.33.0.0/24
mtu: 1500
nodes:
sw1:
@ -29,12 +32,14 @@ nodes:
addresses: { underlay: 192.168.14.5 }, secondary: { underlay: [169.254.0.4/28] },
loopback: 10.255.255.2/32, frr: frr/rr2.conf }
hv1:
{ role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, provision: provision/hypervisor.sh,
{ role: host, image: debian12, cpus: 4, memory: 16384,
segments: [underlay, lan], addresses: { underlay: 192.168.14.11, lan: 10.33.0.11 },
frr: frr/hv1.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/two.yml, bin: bin },
services: [agent.service] }
hv2:
{ role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin },
{ role: host, image: debian12, cpus: 4, memory: 16384,
segments: [underlay, lan], addresses: { underlay: 192.168.14.12, lan: 10.33.0.12 },
frr: frr/hv2.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin },
services: [agent.service] }

View file

@ -10,6 +10,9 @@ segments:
routers: [sw1, sw2]
cidr: 192.168.14.0/24
mtu: 9000
lan:
cidr: 10.33.0.0/24
mtu: 1500
nodes:
sw1:
@ -29,17 +32,19 @@ nodes:
addresses: { underlay: 192.168.14.5 }, secondary: { underlay: [169.254.0.4/28] },
loopback: 10.255.255.2/32, frr: frr/rr2.conf }
hv1:
{ role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
addresses: { underlay: 192.168.14.11 }, frr: frr/hv1.conf, provision: provision/hypervisor.sh,
{ role: host, image: debian12, cpus: 4, memory: 16384,
segments: [underlay, lan], addresses: { underlay: 192.168.14.11, lan: 10.33.0.11 },
frr: frr/hv1.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/two.yml, bin: bin },
services: [agent.service] }
hv2:
{ role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
addresses: { underlay: 192.168.14.12 }, frr: frr/hv2.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin },
{ role: host, image: debian12, cpus: 4, memory: 16384,
segments: [underlay, lan], addresses: { underlay: 192.168.14.12, lan: 10.33.0.12 },
frr: frr/hv2.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin },
services: [agent.service] }
hv3:
{ role: host, image: debian12, cpus: 4, memory: 16384, segments: [underlay],
addresses: { underlay: 192.168.14.13 }, frr: frr/hv3.conf, provision: provision/hypervisor.sh,
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/bgp.yml, bin: bin },
post_provision: provision/hypervisor-post.sh, files: { agent.yml: agent/dnsmasq.yml, bin: bin },
services: [agent.service] }

View file

@ -10,6 +10,17 @@ until curl -fsS -o /dev/null "${GIT_SERVER}"; do
sleep 10
done
install -D -m 0640 "${LAB_FILES}/agent.yml" /etc/two/agent.yml
if [ -e /sys/class/net/lan ]; then
addr=$(ip -4 -o addr show dev lan | awk '{print $4}' | head -n 1)
ip link show br-lan >/dev/null 2>&1 || ip link add name br-lan type bridge stp_state 0
ip link set dev br-lan mtu "$(cat /sys/class/net/lan/mtu)"
ip link set dev lan master br-lan
ip link set dev br-lan up
if [ -n "${addr}" ]; then
ip addr del "${addr}" dev lan
ip addr replace "${addr}" dev br-lan
fi
fi
mkdir -p /opt/two/scripts
cd /opt/two/scripts
for script in deploy.sh bootstrap_kvm.sh; do