From 0d1ab7dc80bc719095935bedf3deebfc74b9a1d8 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Thu, 16 Jan 2020 09:15:15 +0100 Subject: [PATCH] evpn: add support for local frr.config For users with complex setup (underlay ebgp for example), allow user to add a /etc/frr/frr.conf.local Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Controllers/EvpnPlugin.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/PVE/Network/SDN/Controllers/EvpnPlugin.pm index c8bf76a..6369c45 100644 --- a/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -262,7 +262,18 @@ sub write_controller_config { push @{$final_config}, "hostname $nodename"; push @{$final_config}, "!"; - generate_frr_recurse($final_config, $config->{frr}, undef, 0); + if (-e "/etc/frr/frr.conf.local") { + open my $fh, '<', '/etc/frr/frr.conf.local' or die "Can't open file $!"; + generate_frr_recurse($final_config, $config->{frr}->{vrf}, "vrf", 1); + push @{$final_config}, "!"; + + while (my $line = <$fh>) { + chomp ($line); + push @{$final_config}, $line; + } + } else { + generate_frr_recurse($final_config, $config->{frr}, undef, 0); + } push @{$final_config}, "!"; push @{$final_config}, "line vty"; -- 2.39.5