summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-15 22:54:58 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-16 08:37:43 +0000
commit64c8318b94d91b37ddc60632aa1203f37e65ccd7 (patch)
tree1b984783b63559030cdf2d26094a2277cd2ce650 /src/conf_mode
parenta681ddef742367dd0fc59df15c857f2190059fcc (diff)
downloadvyos-1x-64c8318b94d91b37ddc60632aa1203f37e65ccd7.tar.gz
vyos-1x-64c8318b94d91b37ddc60632aa1203f37e65ccd7.zip
T6001: add option to disable next-hop-tracking resolve-via-default
* set system ip nht no-resolve-via-default * set system ipv6 nht no-resolve-via-default (cherry picked from commit ece0e768f36e52f8964823d891264d7c187204ec)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/system_ip.py1
-rwxr-xr-xsrc/conf_mode/system_ipv6.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/conf_mode/system_ip.py b/src/conf_mode/system_ip.py
index 7612e2c0d..833f89554 100755
--- a/src/conf_mode/system_ip.py
+++ b/src/conf_mode/system_ip.py
@@ -127,6 +127,7 @@ def apply(opt):
# The route-map used for the FIB (zebra) is part of the zebra daemon
frr_cfg.load_configuration(zebra_daemon)
+ frr_cfg.modify_section(r'no ip nht resolve-via-default')
frr_cfg.modify_section(r'ip protocol \w+ route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
if 'frr_zebra_config' in opt:
frr_cfg.add_before(frr.default_add_before, opt['frr_zebra_config'])
diff --git a/src/conf_mode/system_ipv6.py b/src/conf_mode/system_ipv6.py
index 90a1a8087..00d440e35 100755
--- a/src/conf_mode/system_ipv6.py
+++ b/src/conf_mode/system_ipv6.py
@@ -104,6 +104,7 @@ def apply(opt):
# The route-map used for the FIB (zebra) is part of the zebra daemon
frr_cfg.load_configuration(zebra_daemon)
+ frr_cfg.modify_section(r'no ipv6 nht resolve-via-default')
frr_cfg.modify_section(r'ipv6 protocol \w+ route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
if 'frr_zebra_config' in opt:
frr_cfg.add_before(frr.default_add_before, opt['frr_zebra_config'])