summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-11-27 10:32:01 +0100
committerChristian Poessinger <christian@poessinger.com>2021-11-27 10:32:01 +0100
commit1c15e9de76f81383a32e60d2af54444dbb0474a1 (patch)
tree5f1a03db605bae2b1d22e49137c8afb94cf964cd /data/templates/frr
parent09064990b9e3ed0a19c1ca4257b385f92d25af2a (diff)
downloadvyos-1x-1c15e9de76f81383a32e60d2af54444dbb0474a1.tar.gz
vyos-1x-1c15e9de76f81383a32e60d2af54444dbb0474a1.zip
ospf: T3753: adjust to CLI options new in FRR 8.0
FRR 7.5 router ospf passive-interface default no passive-interface eth0.202 Changed int FRR 8 to interface eth0.202 no ip ospf passive ! router ospf ospf router-id 172.18.254.202 log-adjacency-changes detail passive-interface default
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/ospfd.frr.tmpl12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/templates/frr/ospfd.frr.tmpl b/data/templates/frr/ospfd.frr.tmpl
index f65bb6e74..37d6f394b 100644
--- a/data/templates/frr/ospfd.frr.tmpl
+++ b/data/templates/frr/ospfd.frr.tmpl
@@ -49,10 +49,8 @@ interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
{% if iface_config.network is defined and iface_config.network is not none %}
ip ospf network {{ iface_config.network }}
{% endif %}
-{% if passive_interface_exclude is defined and passive_interface_exclude is not none %}
-{% if iface in passive_interface_exclude %}
- no ip ospf passive
-{% endif %}
+{% if iface_config.passive is defined %}
+ {{ 'no ' if iface_config.passive.disable is defined }}ip ospf passive
{% endif %}
!
{% endfor %}
@@ -163,10 +161,8 @@ router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
ospf router-id {{ parameters.router_id }}
{% endif %}
{% endif %}
-{% if passive_interface is defined and passive_interface is not none %}
-{% for interface in passive_interface %}
- passive-interface {{ interface }}
-{% endfor %}
+{% if passive_interface is defined and passive_interface.default is defined %}
+ passive-interface default
{% endif %}
{% if redistribute is defined and redistribute is not none %}
{% for protocol, protocols_options in redistribute.items() %}