diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-11-27 10:32:01 +0100 |
| commit | 2e9116e9661ce355dedf5f9d0a2afb1fdbedf786 (patch) | |
| tree | f999edc1cd585a1d6ad0efe3b5ee9d8450fedcdf /data/templates/frr/ospfd.frr.tmpl | |
| parent | 374bd7b2c5609fe9ee280262395aa6e101a20d8d (diff) | |
| download | vyos-1x-2e9116e9661ce355dedf5f9d0a2afb1fdbedf786.tar.gz vyos-1x-2e9116e9661ce355dedf5f9d0a2afb1fdbedf786.zip | |
ospf: T3753: adjust to CLI options new in FRR 8.0
Diffstat (limited to 'data/templates/frr/ospfd.frr.tmpl')
| -rw-r--r-- | data/templates/frr/ospfd.frr.tmpl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/data/templates/frr/ospfd.frr.tmpl b/data/templates/frr/ospfd.frr.tmpl index 90a6bbd56..f65bb6e74 100644 --- a/data/templates/frr/ospfd.frr.tmpl +++ b/data/templates/frr/ospfd.frr.tmpl @@ -49,6 +49,11 @@ 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 %} +{% endif %} ! {% endfor %} {% endif %} @@ -163,14 +168,6 @@ router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }} 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 %} -{% endif %} {% if redistribute is defined and redistribute is not none %} {% for protocol, protocols_options in redistribute.items() %} {% if protocol == 'table' %} |