proxmox-mirrors/pve-network
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-network synced 2025-08-09 12:30:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

controllers: evpn : remove ip forwarding, ipv6 forwarding and add frr version

Browse Source 
Forwarding is enabled by default since frr 7.4
also add frr version && reorder some options to avoid warning message on frr reload

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2022-02-11 10:33:31 +01:00 committed by Thomas Lamprecht
parent 3a46bcb1ce
commit 9c7dded6e3
15 changed files with 45 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/Network/SDN/Controllers/EvpnPlugin.pm
View File

@ -369,12 +369,11 @@ sub generate_controller_rawconfig {
my $nodename = PVE::INotify::nodename(); my $nodename = PVE::INotify::nodename();
my $final_config = []; my $final_config = [];
push @{$final_config}, "log syslog informational"; push @{$final_config}, "frr version 8.0.1";
push @{$final_config}, "ip forwarding";
push @{$final_config}, "ipv6 forwarding";
push @{$final_config}, "frr defaults datacenter"; push @{$final_config}, "frr defaults datacenter";
push @{$final_config}, "service integrated-vtysh-config";
push @{$final_config}, "hostname $nodename"; push @{$final_config}, "hostname $nodename";
push @{$final_config}, "log syslog informational";
push @{$final_config}, "service integrated-vtysh-config";
push @{$final_config}, "!"; push @{$final_config}, "!";
if (-e "/etc/frr/frr.conf.local") { if (-e "/etc/frr/frr.conf.local") {

7
test/zones/evpn/advertise_subnets/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ebgp/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ebgp_loopback/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32 ip prefix-list loopbacks_ips seq 10 permit 0.0.0.0/0 le 32
ip protocol bgp route-map correct_src ip protocol bgp route-map correct_src

7
test/zones/evpn/exitnode/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/exitnode_local_routing/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
ip route 10.0.0.0/24 10.255.255.2 xvrf_myzone ip route 10.0.0.0/24 10.255.255.2 xvrf_myzone
! !

7
test/zones/evpn/exitnode_primary/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/exitnode_snat/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ipv4/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ipv4ipv6/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/ipv6/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/multipath_relax/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone

7
test/zones/evpn/rt_import/expected_controller_config
View File

@ -1,9 +1,8 @@
log syslog informational frr version 8.0.1
ip forwarding
ipv6 forwarding
frr defaults datacenter frr defaults datacenter
service integrated-vtysh-config
hostname localhost hostname localhost
log syslog informational
service integrated-vtysh-config
! !
! !
vrf vrf_myzone vrf vrf_myzone