diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-01 20:55:57 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-01 19:28:25 +0000 |
| commit | 1fb8c0445f015bfe6750a005d241b1950a694f0f (patch) | |
| tree | 2ffed828da444075230b2fc1a580e82e893dc2b0 /data/templates/frr | |
| parent | c37bbccf18b82f47bb7211a445b054d3606da3cb (diff) | |
| download | vyos-1x-1fb8c0445f015bfe6750a005d241b1950a694f0f.tar.gz vyos-1x-1fb8c0445f015bfe6750a005d241b1950a694f0f.zip | |
vrf: T6189: render FRR L3VNI configuration when creating VRF instance
When adding and removing VRF instances on the fly it was noticed that the vni
statement under the VRF instance in FRR vanishes. This was caused by a race
condition which was previously designed to fix another bug.
The wierd design of a Python helper below the VRF tree to only generate the
VNI configuration nodes is now gone and all is rendered in the proper place.
(cherry picked from commit e7bb65894f86372dc0f6e8fd39b1628e0a224c68)
Diffstat (limited to 'data/templates/frr')
| -rw-r--r-- | data/templates/frr/zebra.vrf.route-map.frr.j2 | 6 |
1 files changed, 1 insertions, 5 deletions
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 |