diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-08-13 21:11:58 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-08-13 21:33:09 +0200 |
| commit | da94e0a736874d9a6420ec1aa754efcec684b390 (patch) | |
| tree | d06d7939a2fa58b84e65b4b856f6180bccdf2452 /data | |
| parent | 595ab70a5d50ef1f9e166959affd96ea1ee8c8c8 (diff) | |
| download | vyos-1x-da94e0a736874d9a6420ec1aa754efcec684b390.tar.gz vyos-1x-da94e0a736874d9a6420ec1aa754efcec684b390.zip | |
vrf: T3734: T3728: vni must be configured with a higher priority then bgpd
When removing bgp (vrf) instances the assigned VRF vni must be deleted from FRR
prior the removal of the bgp settings (T3734).
This is now done by moving the CLI command "set vrf name red vni 1000" to a
dedicated Python script with a priority higher then bgp.
Diffstat (limited to 'data')
| -rw-r--r-- | data/configd-include.json | 1 | ||||
| -rw-r--r-- | data/templates/frr/vrf-vni.frr.tmpl | 7 | ||||
| -rw-r--r-- | data/templates/frr/vrf.frr.tmpl | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/data/configd-include.json b/data/configd-include.json index 3b4e2925b..2d7ea149b 100644 --- a/data/configd-include.json +++ b/data/configd-include.json @@ -69,5 +69,6 @@ "vpn_pptp.py", "vpn_sstp.py", "vrf.py", +"vrf_vni.py", "vrrp.py" ] diff --git a/data/templates/frr/vrf-vni.frr.tmpl b/data/templates/frr/vrf-vni.frr.tmpl new file mode 100644 index 000000000..51d4ede1b --- /dev/null +++ b/data/templates/frr/vrf-vni.frr.tmpl @@ -0,0 +1,7 @@ +{% if vrf is defined and vrf is not none %} +vrf {{ vrf }} +{% if vni is defined and vni is not none %} + vni {{ vni }} +{% endif %} + exit-vrf +{% endif %} diff --git a/data/templates/frr/vrf.frr.tmpl b/data/templates/frr/vrf.frr.tmpl deleted file mode 100644 index 299c9719e..000000000 --- a/data/templates/frr/vrf.frr.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -{% if name is defined and name is not none %} -{% for vrf, vrf_config in name.items() %} -vrf {{ vrf }} -{% if vrf_config.vni is defined and vrf_config.vni is not none %} - vni {{ vrf_config.vni }} -{% endif %} - exit-vrf -{% endfor %} -{% endif %} |