matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[frr]: Force disable next hop group support. (#17344) (#17423)

Browse Source
This commit is contained in:
mssonicbld 2023-12-06 15:53:52 +08:00 committed by GitHub
parent 26250f4e4f
commit 337f925058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-fpm-frr/docker_init.sh
View File

@ -49,6 +49,10 @@ write_default_zebra_config()
echo "no fpm use-next-hop-groups" >> $FILE_NAME
echo "fpm address 127.0.0.1" >> $FILE_NAME
}
grep -q '^no zebra nexthop kernel enable' $FILE_NAME || {
echo "no zebra nexthop kernel enable" >> $FILE_NAME
}
}
if [[ ! -z "$NAMESPACE_ID" ]]; then

2
dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2
View File

@ -7,6 +7,8 @@
{% endblock banner %}
!
{% block fpm %}
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

3
platform/vs/docker-sonic-vs/frr/zebra.conf
View File

@ -1,4 +1,3 @@
no zebra nexthop kernel enable
no fpm use-next-hop-groups
fpm address 127.0.0.1

2
src/sonic-bgpcfgd/tests/data/sonic-cfggen/zebra/zebra.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-vni-zebra.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-zebra.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py2/zebra_frr.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-vni-zebra.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-zebra.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!

2
src/sonic-config-engine/tests/sample_output/py3/zebra_frr.conf
View File

@ -4,6 +4,8 @@
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!