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
commit09064990b9e3ed0a19c1ca4257b385f92d25af2a (patch)
tree504c955dc1da1bcddf535559855ef084ee57b0b0 /data/templates/frr
parent2e9116e9661ce355dedf5f9d0a2afb1fdbedf786 (diff)
downloadvyos-1x-09064990b9e3ed0a19c1ca4257b385f92d25af2a.tar.gz
vyos-1x-09064990b9e3ed0a19c1ca4257b385f92d25af2a.zip
ospfv3: T3753: adjust to CLI options new in FRR 8.0
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/ospf6d.frr.tmpl8
1 files changed, 3 insertions, 5 deletions
diff --git a/data/templates/frr/ospf6d.frr.tmpl b/data/templates/frr/ospf6d.frr.tmpl
index a8c53738f..c6527ed6c 100644
--- a/data/templates/frr/ospf6d.frr.tmpl
+++ b/data/templates/frr/ospf6d.frr.tmpl
@@ -2,6 +2,9 @@
{% if interface is defined and interface is not none %}
{% for iface, iface_config in interface.items() %}
interface {{ iface }}
+{% if iface_config.area is defined and iface_config.area is not none %}
+ ipv6 ospf6 area {{ iface_config.area }}
+{% endif %}
{% if iface_config.cost is defined and iface_config.cost is not none %}
ipv6 ospf6 cost {{ iface_config.cost }}
{% endif %}
@@ -45,11 +48,6 @@ interface {{ iface }}
router ospf6
{% if area is defined and area is not none %}
{% for area_id, area_config in area.items() %}
-{% if area_config.interface is defined and area_config.interface is not none %}
-{% for interface in area_config.interface %}
- interface {{ interface }} area {{ area_id }}
-{% endfor %}
-{% endif %}
{% if area_config.area_type is defined and area_config.area_type is not none %}
{% for type, type_config in area_config.area_type.items() %}
area {{ area_id }} {{ type }} {{ 'no-summary' if type_config.no_summary is defined }}