diff options
author | erkin <e.altunbas@vyos.io> | 2021-12-16 17:31:57 +0300 |
---|---|---|
committer | erkin <e.altunbas@vyos.io> | 2021-12-16 17:31:57 +0300 |
commit | 95b91627a6065b720365c9ae7d124d85fc8e493d (patch) | |
tree | 1d743211400347d3847623fb0e17dd39dbfb604c /data/templates/frr/ospfd.frr.tmpl | |
parent | dc8c230ad45a10be93fc2cd79c38ebb39fd0a148 (diff) | |
parent | 5a871f0dac024c7c0c59f1a1709543c4cc5e4f96 (diff) | |
download | vyos-1x-95b91627a6065b720365c9ae7d124d85fc8e493d.tar.gz vyos-1x-95b91627a6065b720365c9ae7d124d85fc8e493d.zip |
Merge branch 'current' of https://github.com/erkin/vyos-1x into current
Diffstat (limited to 'data/templates/frr/ospfd.frr.tmpl')
-rw-r--r-- | data/templates/frr/ospfd.frr.tmpl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/data/templates/frr/ospfd.frr.tmpl b/data/templates/frr/ospfd.frr.tmpl index 90a6bbd56..a7b770f07 100644 --- a/data/templates/frr/ospfd.frr.tmpl +++ b/data/templates/frr/ospfd.frr.tmpl @@ -49,6 +49,10 @@ 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 iface_config.passive is defined %} + {{ 'no ' if iface_config.passive.disable is defined }}ip ospf passive +{% endif %} +exit ! {% endfor %} {% endif %} @@ -158,18 +162,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 %} -{% endif %} -{% if passive_interface_exclude is defined and passive_interface_exclude is not none %} -{% for interface in passive_interface_exclude if passive_interface_exclude is defined %} -{% if interface.startswith('vlink') %} -{% set interface = interface.upper() %} -{% endif %} - no 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() %} @@ -189,4 +183,5 @@ router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }} {# Timer values have default values #} timers throttle spf {{ timers.throttle.spf.delay }} {{ timers.throttle.spf.initial_holdtime }} {{ timers.throttle.spf.max_holdtime }} {% endif %} +exit ! |