Skip to content

Commit

Permalink
kamel: fix frr VXLAN EVPN configuration for unified config (PR sonic-…
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
bradh352 authored and bluecmd committed Dec 28, 2024
1 parent cb4849e commit a19c157
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/sonic-frr-mgmt-framework/templates/frr/frr.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@
!
agentx
!
!Add fpm address for zebra
{% if ( ('localhost' in DEVICE_METADATA) and ('nexthop_group' in DEVICE_METADATA['localhost']) and
(DEVICE_METADATA['localhost']['nexthop_group'] == 'enabled') ) %}
! enable next hop group support
fpm use-next-hop-groups
{% else %}
! 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
{% endif %}
!
! Add fpm address for zebra
fpm address 127.0.0.1
!
{% include "zebra/zebra.interfaces.conf.j2" %}
!
{% if MGMT_VRF_CONFIG %}
Expand Down

0 comments on commit a19c157

Please sign in to comment.