summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-11-07 08:27:43 +0100
committerGitHub <noreply@github.com>2023-11-07 08:27:43 +0100
commit366ee7d81082ec3322ec121c98aa3b78364cdeeb (patch)
tree2b9f6b980340694294cb4559f275f703173644ef
parent56e2864bf29f25a0dd4195bb7f4d42e74ca66644 (diff)
parentf9bc65c93fb7078ed90f46f18ca9a5ed140f8fb4 (diff)
downloadvyos-1x-366ee7d81082ec3322ec121c98aa3b78364cdeeb.tar.gz
vyos-1x-366ee7d81082ec3322ec121c98aa3b78364cdeeb.zip
Merge pull request #2449 from vyos/mergify/bp/sagitta/pr-2357
ldpd: T5648: Fix ldpd template errors (backport #2357)
-rw-r--r--data/templates/frr/ldpd.frr.j210
1 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/frr/ldpd.frr.j2 b/data/templates/frr/ldpd.frr.j2
index 11aff331a..9a893cc55 100644
--- a/data/templates/frr/ldpd.frr.j2
+++ b/data/templates/frr/ldpd.frr.j2
@@ -14,19 +14,19 @@ mpls ldp
ordered-control
{% endif %}
{% if ldp.neighbor is vyos_defined %}
-{% for neighbor, neighbor_config in ldp.neighbor %}
+{% for neighbor, neighbor_config in ldp.neighbor.items() %}
{% if neighbor_config.password is vyos_defined %}
- neighbor {{ neighbors }} password {{ neighbor_config.password }}
+ neighbor {{ neighbor }} password {{ neighbor_config.password }}
{% endif %}
{% if neighbor_config.ttl_security is vyos_defined %}
{% if neighbor_config.ttl_security.disable is vyos_defined %}
- neighbor {{ neighbors }} ttl-security disable
+ neighbor {{ neighbor }} ttl-security disable
{% else %}
- neighbor {{ neighbors }} ttl-security hops {{ neighbor_config.ttl_security }}
+ neighbor {{ neighbor }} ttl-security hops {{ neighbor_config.ttl_security }}
{% endif %}
{% endif %}
{% if neighbor_config.session_holdtime is vyos_defined %}
- neighbor {{ neighbors }} session holdtime {{ neighbor_config.session_holdtime }}
+ neighbor {{ neighbor }} session holdtime {{ neighbor_config.session_holdtime }}
{% endif %}
{% endfor %}
{% endif %}