diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-01 21:27:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 21:27:27 +0200 |
| commit | 4387d096d15efa111bade59452d3fbdb43e7780a (patch) | |
| tree | 27c36d4ce7b4c8ec3a3d95e633272b217887b3aa /data | |
| parent | 986743cd67f56605c5ea9ae7153da5fe44055775 (diff) | |
| parent | 7b46172a4aecc714d929aecb8768ab82633de3ba (diff) | |
| download | vyos-1x-4387d096d15efa111bade59452d3fbdb43e7780a.tar.gz vyos-1x-4387d096d15efa111bade59452d3fbdb43e7780a.zip | |
Merge pull request #3392 from c-po/bgp-evpn-T6189
bgp: T6189: L3VPN connectivity is broken after re-enabling VRF
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 dc00f0698..0c767f987 100644 --- a/data/configd-include.json +++ b/data/configd-include.json @@ -108,6 +108,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 |