From a7fb7db978b0cee18521c75f880c89f1ec6eb7eb Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 5 Apr 2026 17:21:51 +0200 Subject: [PATCH] Move to interface-based OSPF config --- config/vpp1/frr.conf | 5 +---- config/vpp2/frr.conf | 2 +- vpp-frr.clab.yml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config/vpp1/frr.conf b/config/vpp1/frr.conf index e320dad..2123dcf 100644 --- a/config/vpp1/frr.conf +++ b/config/vpp1/frr.conf @@ -7,6 +7,7 @@ service integrated-vtysh-config ip router-id 10.82.98.0 ! interface eth2 + ip ospf area 0 ip ospf bfd ip ospf cost 10 ip ospf network point-to-point @@ -22,13 +23,9 @@ exit ! router ospf redistribute connected - network 10.82.98.0/24 area 0 exit ! router ospf6 redistribute connected exit ! -bfd -exit -! diff --git a/config/vpp2/frr.conf b/config/vpp2/frr.conf index 93661ad..83e26d6 100644 --- a/config/vpp2/frr.conf +++ b/config/vpp2/frr.conf @@ -7,6 +7,7 @@ service integrated-vtysh-config ip router-id 10.82.98.1 ! interface eth2 + ip ospf area 0 ip ospf bfd ip ospf cost 10 ip ospf network point-to-point @@ -22,7 +23,6 @@ exit ! router ospf redistribute connected - network 10.82.98.0/24 area 0 exit ! router ospf6 diff --git a/vpp-frr.clab.yml b/vpp-frr.clab.yml index c75fd2a..d3d32e2 100644 --- a/vpp-frr.clab.yml +++ b/vpp-frr.clab.yml @@ -7,7 +7,7 @@ topology: image: git.ipng.ch/ipng/vpp-containerlab:latest startup-config: config/__clabNodeName__/vppcfg.yaml binds: - - config/__clabNodeName__/frr.conf:/config/frr/frr.conf + - config/__clabNodeName__/frr.conf:/config/frr/frr.conf:rw env-files: - config/lab-frr.env linux: