diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-11-27 19:36:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-27 19:36:34 +0100 |
commit | 59dc14bee7ca6e4fd2bbabe5c5ae7518839e7a80 (patch) | |
tree | 8164c4cb49efaf0be512e6133259f4b4cfac6009 /data/templates/frr/ospf6d.frr.tmpl | |
parent | 1df8ba611f04c46d49f4cf70d6fa22cfef089392 (diff) | |
parent | 5e38895c906f05ecd3815573f07106a9ccab145a (diff) | |
download | vyos-1x-59dc14bee7ca6e4fd2bbabe5c5ae7518839e7a80.tar.gz vyos-1x-59dc14bee7ca6e4fd2bbabe5c5ae7518839e7a80.zip |
Merge pull request #1089 from c-po/t3753-frr8
T3753 - CLI adjustments for FRR8.1
Diffstat (limited to 'data/templates/frr/ospf6d.frr.tmpl')
-rw-r--r-- | data/templates/frr/ospf6d.frr.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/frr/ospf6d.frr.tmpl b/data/templates/frr/ospf6d.frr.tmpl index a8c53738f..5871b3d7a 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 %} @@ -38,6 +41,7 @@ interface {{ iface }} {% if iface_config.passive is defined %} ipv6 ospf6 passive {% endif %} +exit ! {% endfor %} {% endif %} @@ -45,11 +49,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 }} @@ -89,4 +88,5 @@ router ospf6 redistribute {{ protocol }} {{ 'route-map ' + options.route_map if options.route_map is defined }} {% endfor %} {% endif %} +exit ! |