summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-01-12 19:40:00 +0100
committerGitHub <noreply@github.com>2023-01-12 19:40:00 +0100
commit0b59afbb9fd06abf87ed340f05b977e52e516266 (patch)
tree8c5730e78b032dde890b8fbfbc8432dc86359ff0 /data/templates
parent9804a878aa929946b280ded9ae6d1379f94044ad (diff)
parent20f448d16c31088ccdcd76d11d11de5f1ac96ce0 (diff)
downloadvyos-1x-0b59afbb9fd06abf87ed340f05b977e52e516266.tar.gz
vyos-1x-0b59afbb9fd06abf87ed340f05b977e52e516266.zip
Merge pull request #1754 from vfreex/ospf-area-range-fix
T4934: ospf: Fix inter-area route summarization
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/frr/ospfd.frr.j28
1 files changed, 5 insertions, 3 deletions
diff --git a/data/templates/frr/ospfd.frr.j2 b/data/templates/frr/ospfd.frr.j2
index 0baff2d72..8c4a81c57 100644
--- a/data/templates/frr/ospfd.frr.j2
+++ b/data/templates/frr/ospfd.frr.j2
@@ -84,11 +84,13 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
{% endfor %}
{% if area_config.range is vyos_defined %}
{% for range, range_config in area_config.range.items() %}
-{% if range_config.cost is vyos_defined %}
- area {{ area_id }} range {{ range }} cost {{ range_config.cost }}
-{% endif %}
{% if range_config.not_advertise is vyos_defined %}
area {{ area_id }} range {{ range }} not-advertise
+{% else %}
+ area {{ area_id }} range {{ range }}
+{% endif %}
+{% if range_config.cost is vyos_defined %}
+ area {{ area_id }} range {{ range }} cost {{ range_config.cost }}
{% endif %}
{% if range_config.substitute is vyos_defined %}
area {{ area_id }} range {{ range }} substitute {{ range_config.substitute }}