diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-05-02 17:10:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 17:10:54 +0200 |
| commit | a6cc2b4ccbcbf4b427b68000e4b31b9bd95a1d64 (patch) | |
| tree | f88aaeac98bcef962097e89b4da3453759b58a85 /data | |
| parent | 36aeda94a2b16b2abe340d165dbc4f8ff01db756 (diff) | |
| parent | 45897d149473e88dd78bcd58c37d26c9f608c549 (diff) | |
| download | vyos-1x-a6cc2b4ccbcbf4b427b68000e4b31b9bd95a1d64.tar.gz vyos-1x-a6cc2b4ccbcbf4b427b68000e4b31b9bd95a1d64.zip | |
Merge pull request #3393 from vyos/mergify/bp/sagitta/pr-3392
bgp: T6189: L3VPN connectivity is broken after re-enabling VRF (backport #3392)
Diffstat (limited to 'data')
| -rw-r--r-- | data/configd-include.json | 3 | ||||
| -rw-r--r-- | data/templates/frr/zebra.vrf.route-map.frr.j2 | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/data/configd-include.json b/data/configd-include.json index fe27ae2b7..212b260e1 100644 --- a/data/configd-include.json +++ b/data/configd-include.json @@ -107,6 +107,5 @@ "vpn_openconnect.py", "vpn_pptp.py", "vpn_sstp.py", -"vrf.py", -"vrf_vni.py" +"vrf.py" ] diff --git a/data/templates/frr/zebra.vrf.route-map.frr.j2 b/data/templates/frr/zebra.vrf.route-map.frr.j2 index f1cc6fe66..8ebb82511 100644 --- a/data/templates/frr/zebra.vrf.route-map.frr.j2 +++ b/data/templates/frr/zebra.vrf.route-map.frr.j2 @@ -1,10 +1,6 @@ ! {% if name is vyos_defined %} {% for vrf, vrf_config in name.items() %} -{# code path required for vrf_vni.py as we will only render the required VR configuration and not all of them #} -{% if only_vrf is vyos_defined and vrf is not vyos_defined(only_vrf) %} -{% continue %} -{% endif %} vrf {{ vrf }} {% if vrf_config.ip.nht.no_resolve_via_default is vyos_defined %} no ip nht resolve-via-default @@ -25,7 +21,7 @@ vrf {{ vrf }} ipv6 protocol {{ protocol_name }} route-map {{ protocol_config.route_map }} {% endfor %} {% endif %} -{% if vrf_config.vni is vyos_defined and no_vni is not vyos_defined %} +{% if vrf_config.vni is vyos_defined %} vni {{ vrf_config.vni }} {% endif %} exit-vrf |