Skip to content

Commit c0c0692

Browse files
committed
fix frr VXLAN EVPN configuration for unified config (PR sonic-net#21053)
During debugging of VXLAN EVPN using unified vs split configuration, the same BGP configuration is made with one exception, the setting of ``` no fpm use-next-hop-groups ``` Is forcibly set for all FRR instances. This change was introduced in PR sonic-net#12852 when switching to the new fpm dataplane plugin. When running `vtysh -c "config" -c "no fpm use-next-hop-groups"` it can be seen the VTEP immediately comes online and traffic flows as expected. This adds the option as is present in dockers/docker-fpm-frr/frr/zebra/zebra.conf.j2 controlled by the DEVICE_METADATA nexthop_group option. Signed-off-by: Brad House (@bradh352)
1 parent baedd5b commit c0c0692

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2

+11-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,18 @@
1010
!
1111
agentx
1212
!
13-
!Add fpm address for zebra
13+
{% if ( ('localhost' in DEVICE_METADATA) and ('nexthop_group' in DEVICE_METADATA['localhost']) and
14+
(DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}
15+
! enable next hop group support
16+
fpm use-next-hop-groups
17+
{% else %}
18+
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
19+
no fpm use-next-hop-groups
20+
{% endif %}
21+
!
22+
! Add fpm address for zebra
1423
fpm address 127.0.0.1
15-
24+
!
1625
{% include "zebra/zebra.interfaces.conf.j2" %}
1726
!
1827
{% if MGMT_VRF_CONFIG %}

0 commit comments

Comments
 (0)