From 545421ba926a9cd18d77409f44663d55ef77abde Mon Sep 17 00:00:00 2001 From: Robert Volkmann Date: Tue, 16 Apr 2024 09:52:16 +0200 Subject: [PATCH] Downgrade to 202211 FRR 8.5.1 doesn't support `match evpn vni` because of https://github.com/FRRouting/frr/issues/14419 --- Makefile | 2 +- files/inet/frr.conf | 7 ++----- files/inet/network.sh | 30 +++++++++++++++--------------- roles/sonic/defaults/main.yaml | 4 ++-- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index d7ccc89c..784ac0bf 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ MINI_LAB_VM_IMAGE := $(or $(MINI_LAB_VM_IMAGE),ghcr.io/metal-stack/mini-lab-vms: MACHINE_OS=ubuntu-22.04 # Check: https://sonic-build.azurewebsites.net/ui/sonic/pipelines -SONIC_REMOTE_IMG := https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=202305&platform=vs&target=target%2Fsonic-vs.img.gz +SONIC_REMOTE_IMG := https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=202211&platform=vs&target=target%2Fsonic-vs.img.gz # Machine flavors ifeq ($(MINI_LAB_FLAVOR),default) diff --git a/files/inet/frr.conf b/files/inet/frr.conf index 4f24be1a..0e32b873 100644 --- a/files/inet/frr.conf +++ b/files/inet/frr.conf @@ -3,7 +3,7 @@ hostname inet ! log syslog informational ! -vrf vrf104009 +vrf vrfInternet vni 104009 ip route 0.0.0.0/0 172.17.0.1 exit-vrf @@ -38,12 +38,9 @@ router bgp 4200000021 neighbor FABRIC allowas-in 2 exit-address-family ! -router bgp 4200000021 vrf vrf104009 +router bgp 4200000021 vrf vrfInternet bgp router-id 10.0.0.21 bgp bestpath as-path multipath-relax - neighbor INTERNET peer-group - neighbor INTERNET remote-as external - neighbor INTERNET timers 1 3 ! address-family ipv4 unicast redistribute static diff --git a/files/inet/network.sh b/files/inet/network.sh index 32038571..5b0313c2 100644 --- a/files/inet/network.sh +++ b/files/inet/network.sh @@ -1,29 +1,29 @@ #!/bin/sh set -o errexit -o xtrace -ip link add vrf104009 type vrf table 1000 -ip link set dev vrf104009 up -ip link set dev eth0 master vrf104009 +ip link add vrfInternet type vrf table 1000 +ip link set dev vrfInternet up +ip link set dev eth0 master vrfInternet ip link add name bridge type bridge stp_state 0 ip link set dev bridge type bridge vlan_filtering 1 ip link set dev bridge mtu 9000 ip link set dev bridge up -ip link add link bridge up name vlan104009 type vlan id 1000 -ip link set dev vlan104009 mtu 9000 -ip link set dev vlan104009 master vrf104009 +ip link add link bridge up name vlanInternet type vlan id 1000 +ip link set dev vlanInternet mtu 9000 +ip link set dev vlanInternet master vrfInternet bridge vlan del vid 1 dev bridge self bridge vlan add vid 1000 dev bridge self -ip link set dev vlan104009 up +ip link set dev vlanInternet up -ip link add vni104009 type vxlan id 104009 dstport 4789 local 10.0.0.21 nolearning -ip link set dev vlan104009 mtu 9000 -ip link set dev vni104009 master bridge -bridge vlan del vid 1 dev vni104009 -bridge vlan del vid 1 untagged pvid dev vni104009 -bridge vlan add vid 1000 dev vni104009 -bridge vlan add vid 1000 untagged pvid dev vni104009 -ip link set up dev vni104009 +ip link add vniInternet type vxlan id 104009 dstport 4789 local 10.0.0.21 nolearning +ip link set dev vlanInternet mtu 9000 +ip link set dev vniInternet master bridge +bridge vlan del vid 1 dev vniInternet +bridge vlan del vid 1 untagged pvid dev vniInternet +bridge vlan add vid 1000 dev vniInternet +bridge vlan add vid 1000 untagged pvid dev vniInternet +ip link set up dev vniInternet iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE diff --git a/roles/sonic/defaults/main.yaml b/roles/sonic/defaults/main.yaml index 5e859cf6..2867b20b 100644 --- a/roles/sonic/defaults/main.yaml +++ b/roles/sonic/defaults/main.yaml @@ -1,4 +1,4 @@ --- -branch_name: "202305" +branch_name: "202211" base_url: "https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName={{ branch_name }}&platform=vs" -frr_pythontools_url: "{{ base_url }}&target=target%2Fdebs%2Fbullseye%2Ffrr-pythontools_8.5.1-sonic-0_all.deb" +frr_pythontools_url: "{{ base_url }}&target=target%2Fdebs%2Fbullseye%2Ffrr-pythontools_8.2.2-sonic-0_all.deb"