From 0a581bfc28504fbf5b19272a332ad5ffe1edb249 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 21 Apr 2023 21:20:40 +0200
Subject: vrf: T5150: l3vni must be removed prior to removing BGP VRF process

---
 data/configd-include.json                     | 3 ++-
 data/templates/frr/zebra.vrf.route-map.frr.j2 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/configd-include.json b/data/configd-include.json
index 2f1d39006..456211caa 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -85,5 +85,6 @@
 "vpn_l2tp.py",
 "vpn_pptp.py",
 "vpn_sstp.py",
-"vrf.py"
+"vrf.py",
+"vrf_vni.py"
 ]
diff --git a/data/templates/frr/zebra.vrf.route-map.frr.j2 b/data/templates/frr/zebra.vrf.route-map.frr.j2
index eb6abd8e7..3c5791c4c 100644
--- a/data/templates/frr/zebra.vrf.route-map.frr.j2
+++ b/data/templates/frr/zebra.vrf.route-map.frr.j2
@@ -18,7 +18,7 @@ vrf {{ vrf }}
 {%         if vrf_config.vni is vyos_defined %}
  vni {{ vrf_config.vni }}
 {%         endif %}
+exit-vrf
 {%     endfor %}
- exit-vrf
 !
 {% endif %}
-- 
cgit v1.2.3