summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-14 18:13:50 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-14 18:13:50 +0200
commite36a4e684b95c4fd1e9ab042270fafd95e697586 (patch)
tree5b837f46f106cd3c0271db07f26b5f41cd6391b1 /data
parent2b8854761c8ed419b2a2f1e02810c3f68f1d72b6 (diff)
downloadvyos-1x-e36a4e684b95c4fd1e9ab042270fafd95e697586.tar.gz
vyos-1x-e36a4e684b95c4fd1e9ab042270fafd95e697586.zip
ospf: T3236: use proper daemon named template file
Diffstat (limited to 'data')
-rw-r--r--data/templates/frr/ospf6d.frr.tmpl (renamed from data/templates/frr/ospfv3.frr.tmpl)0
-rw-r--r--data/templates/frr/ospfd.frr.tmpl (renamed from data/templates/frr/ospf.frr.tmpl)4
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/frr/ospfv3.frr.tmpl b/data/templates/frr/ospf6d.frr.tmpl
index 0026c0d2c..0026c0d2c 100644
--- a/data/templates/frr/ospfv3.frr.tmpl
+++ b/data/templates/frr/ospf6d.frr.tmpl
diff --git a/data/templates/frr/ospf.frr.tmpl b/data/templates/frr/ospfd.frr.tmpl
index 36aa699a9..763d0666c 100644
--- a/data/templates/frr/ospf.frr.tmpl
+++ b/data/templates/frr/ospfd.frr.tmpl
@@ -155,8 +155,8 @@ router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
ospf router-id {{ parameters.router_id }}
{% endif %}
{% endif %}
-{% for interface in passive_interface if passive_interface is defined %}
- passive-interface {{ interface }}
+{% for interface in passive_interface if passive_interface is defined and passive_interface == 'default' %}
+ passive-interface default
{% endfor %}
{% for interface in passive_interface_exclude if passive_interface_exclude is defined %}
{% if interface.startswith('vlink') %}