summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorCheeze-It <kris4067195@hotmail.com>2020-11-11 13:27:51 -0700
committerGitHub <noreply@github.com>2020-11-11 21:27:51 +0100
commit2e498164218851f1b958c43a7b903849a80b8304 (patch)
tree37f065f06e911e2f68d75635c407a52abf1553c5 /data/templates/frr
parent7301659a1303669612c7b4120b17ac50a62dbd24 (diff)
downloadvyos-1x-2e498164218851f1b958c43a7b903849a80b8304.tar.gz
vyos-1x-2e498164218851f1b958c43a7b903849a80b8304.zip
mpls-conf: T915: Add MPLS misc parameters, add LDP misc parameters
This commit has to do with the addition of miscellaneous MPLS parameters, as well as miscellaneous LDP parameters. Per c-po, for miscellaneous options and whatnot that do not fit anywhere we will put them into a specific "parameters" node. I also did some global linux configuration changes here. We make changes to kernel options "net.mpls.ip_ttl_propagate" and "net.mpls.default_ttl" which should allow the behavior of VyOS to have the same as routers from the big vendors. I added two LDP options for cisco interoperation TLV and for a dual stack preference. Lastly, I went through and changes some of the help/description fields in the definitions page because I just felt they weren't uniform and the words seemed to not properly explain what they were doing. I also did some code clean up (or tried to...) with comments and whatnot.
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/ldpd.frr.tmpl12
1 files changed, 12 insertions, 0 deletions
diff --git a/data/templates/frr/ldpd.frr.tmpl b/data/templates/frr/ldpd.frr.tmpl
index 441ddcb3a..4b7e5c5ea 100644
--- a/data/templates/frr/ldpd.frr.tmpl
+++ b/data/templates/frr/ldpd.frr.tmpl
@@ -7,6 +7,18 @@ no router-id {{ old_router_id }}
{% if router_id -%}
router-id {{ router_id }}
{% endif -%}
+{% if old_ldp.cisco_interop_tlv -%}
+no dual-stack cisco-interop
+{% endif -%}
+{% if ldp.cisco_interop_tlv -%}
+dual-stack cisco-interop
+{% endif -%}
+{% if old_ldp.transport_prefer_ipv4 -%}
+no dual-stack transport-connection prefer ipv4
+{% endif -%}
+{% if ldp.transport_prefer_ipv4 -%}
+dual-stack transport-connection prefer ipv4
+{% endif -%}
{% for neighbor_id in old_ldp.neighbors -%}
no neighbor {{neighbor_id}} password {{old_ldp.neighbors[neighbor_id].password}}
{% if 'ttl_security' is defined -%}