diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-16 11:06:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 11:06:27 +0100 |
| commit | db8b115301d5476151e7d0910ba674a683683122 (patch) | |
| tree | 8181127e90e5a8ca6e19a6b1af624acf56482eb4 /data/templates/frr | |
| parent | cefa21ae6425355cf22fbe5123b720c5881d9174 (diff) | |
| parent | 42e83b8b2cca6ba73c2663629cf92b3b2b225898 (diff) | |
| download | vyos-1x-db8b115301d5476151e7d0910ba674a683683122.tar.gz vyos-1x-db8b115301d5476151e7d0910ba674a683683122.zip | |
Merge pull request #3017 from vyos/mergify/bp/sagitta/pr-3016
T6001: add option to disable next-hop-tracking resolve-via-default (backport #3016)
Diffstat (limited to 'data/templates/frr')
| -rw-r--r-- | data/templates/frr/zebra.route-map.frr.j2 | 5 | ||||
| -rw-r--r-- | data/templates/frr/zebra.vrf.route-map.frr.j2 | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/data/templates/frr/zebra.route-map.frr.j2 b/data/templates/frr/zebra.route-map.frr.j2 index 8e18abbde..669d58354 100644 --- a/data/templates/frr/zebra.route-map.frr.j2 +++ b/data/templates/frr/zebra.route-map.frr.j2 @@ -1,4 +1,8 @@ ! +{% if nht.no_resolve_via_default is vyos_defined %} +no {{ afi }} nht resolve-via-default +{% endif %} +! {% if protocol is vyos_defined %} {% for protocol_name, protocol_config in protocol.items() %} {% if protocol_name is vyos_defined('ospfv3') %} @@ -7,3 +11,4 @@ {{ afi }} protocol {{ protocol_name }} route-map {{ protocol_config.route_map }} {% endfor %} {% endif %} +! diff --git a/data/templates/frr/zebra.vrf.route-map.frr.j2 b/data/templates/frr/zebra.vrf.route-map.frr.j2 index 4e1206374..f1cc6fe66 100644 --- a/data/templates/frr/zebra.vrf.route-map.frr.j2 +++ b/data/templates/frr/zebra.vrf.route-map.frr.j2 @@ -6,6 +6,12 @@ {% continue %} {% endif %} vrf {{ vrf }} +{% if vrf_config.ip.nht.no_resolve_via_default is vyos_defined %} + no ip nht resolve-via-default +{% endif %} +{% if vrf_config.ipv6.nht.no_resolve_via_default is vyos_defined %} + no ipv6 nht resolve-via-default +{% endif %} {% if vrf_config.ip.protocol is vyos_defined %} {% for protocol_name, protocol_config in vrf_config.ip.protocol.items() %} ip protocol {{ protocol_name }} route-map {{ protocol_config.route_map }} |