summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-05 23:47:36 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-06 18:54:34 +0200
commitecfbeb7fa3b1d170330e50352002d702535e66b0 (patch)
tree8d4738238d8998f66f631e92e765742a375944bd
parent022cb9ead22a00b895dc6314b33dd77b9c5c144c (diff)
downloadvyos-1x-ecfbeb7fa3b1d170330e50352002d702535e66b0.tar.gz
vyos-1x-ecfbeb7fa3b1d170330e50352002d702535e66b0.zip
frr: T2175: remove no longer required loop when removing VRF VNI
This is a completing commit to a55585a833 ("frr: T2175: remove no longer required loop when removing routing protocols") that was missed out previously.
-rwxr-xr-xsrc/conf_mode/vrf.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index 82956b219..1fd8c134d 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -249,12 +249,6 @@ def apply(vrf):
frr_cfg.add_before(r'(interface .*|line vty)', vrf['new_frr_config'])
frr_cfg.commit_configuration(frr_daemon)
- # If FRR config is blank, rerun the blank commit x times due to frr-reload
- # behavior/bug not properly clearing out on one commit.
- if vrf['new_frr_config'] == '':
- for a in range(5):
- frr_cfg.commit_configuration(frr_daemon)
-
# Save configuration to /run/frr/config/frr.conf
frr.save_configuration()