From c87ad948999c28c3c9449f98d60b545481ea29d5 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 28 Nov 2020 08:25:39 +0100
Subject: vyos.template: T2720: fix remaining in-line time_block syntax

Commit a2ac9fac ("vyos.template: T2720: always enable Jinja2 trim_blocks
feature") globally enabled the trim_blocks feature. Some templates still used
in-line trim_blocks "{%"- or "-%}" which caused miss-placed line endings.

This is fixed by removing all in-line trim_block statememnts of Jinja2 templates.
---
 data/templates/frr/igmp.frr.tmpl | 50 ++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'data/templates/frr/igmp.frr.tmpl')

diff --git a/data/templates/frr/igmp.frr.tmpl b/data/templates/frr/igmp.frr.tmpl
index de4696c1f..cdb7ee6cc 100644
--- a/data/templates/frr/igmp.frr.tmpl
+++ b/data/templates/frr/igmp.frr.tmpl
@@ -1,41 +1,41 @@
 !
-{% for iface in old_ifaces -%}
+{% for iface in old_ifaces %}
 interface {{ iface }}
-{% for group in old_ifaces[iface].gr_join -%}
-{% if old_ifaces[iface].gr_join[group] -%}
-{% for source in old_ifaces[iface].gr_join[group] -%}
+{% for group in old_ifaces[iface].gr_join %}
+{% if old_ifaces[iface].gr_join[group] %}
+{% for source in old_ifaces[iface].gr_join[group] %}
 no ip igmp join {{ group }} {{ source }}
-{% endfor -%}
-{% else -%}
+{% endfor %}
+{% else %}
 no ip igmp join {{ group }}
-{% endif -%}
-{% endfor -%}
+{% endif %}
+{% endfor %}
 no ip igmp
 !
-{% endfor -%}
-{% for iface in ifaces -%}
+{% endfor %}
+{% for iface in ifaces %}
 interface {{ iface }}
-{% if ifaces[iface].version -%}
+{% if ifaces[iface].version %}
 ip igmp version {{ ifaces[iface].version }}
-{% else -%}
+{% else %}
 {# IGMP default version 3 #}
 ip igmp
-{% endif -%}
-{% if ifaces[iface].query_interval -%}
+{% endif %}
+{% if ifaces[iface].query_interval %}
 ip igmp query-interval {{ ifaces[iface].query_interval }}
-{% endif -%}
-{% if ifaces[iface].query_max_resp_time -%}
+{% endif %}
+{% if ifaces[iface].query_max_resp_time %}
 ip igmp query-max-response-time {{ ifaces[iface].query_max_resp_time }}
-{% endif -%}
-{% for group in ifaces[iface].gr_join -%}
-{% if ifaces[iface].gr_join[group] -%}
-{% for source in ifaces[iface].gr_join[group] -%}
+{% endif %}
+{% for group in ifaces[iface].gr_join %}
+{% if ifaces[iface].gr_join[group] %}
+{% for source in ifaces[iface].gr_join[group] %}
 ip igmp join {{ group }} {{ source }}
-{% endfor -%}
-{% else -%}
+{% endfor %}
+{% else %}
 ip igmp join {{ group }}
-{% endif -%}
-{% endfor -%}
+{% endif %}
+{% endfor %}
 !
-{% endfor -%}
+{% endfor %}
 !
-- 
cgit v1.2.3