From dd35eb76153191bc487e3ea23c3e73c753ec1d4b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 7 Mar 2021 20:59:17 +0100
Subject: vxlan: T3319: use default ttl of 16

VyOS 1.2 had a default ttl of 16 hardcoded to the node.def file [1], so until
this is handled via a migration script we have to obey that particular
setting.

[1]: https://github.com/vyos/vyatta-cfg-system/blob/crux/templates/interfaces/vxlan/node.def#L23
---
 interface-definitions/include/interface-parameters-ttl.xml.i | 4 ++--
 interface-definitions/interfaces-vxlan.xml.in                | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/interface-parameters-ttl.xml.i b/interface-definitions/include/interface-parameters-ttl.xml.i
index a6a6f163f..83563ecb1 100644
--- a/interface-definitions/include/interface-parameters-ttl.xml.i
+++ b/interface-definitions/include/interface-parameters-ttl.xml.i
@@ -1,10 +1,10 @@
 <!-- included start from interface-parameters-ttl.xml.i -->
 <leafNode name="ttl">
   <properties>
-    <help>Specifies TTL value to use in outgoing packets (default: 0)</help>
+    <help>Specifies TTL value to use in outgoing packets</help>
     <valueHelp>
       <format>0</format>
-      <description>Copy value from original IP header</description>
+      <description>Inherit - copy value from original IP header</description>
     </valueHelp>
     <valueHelp>
       <format>1-255</format>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index d9d2d1033..97a40a9dc 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -55,6 +55,9 @@
                   #include <include/interface-parameters-dont-fragment.xml.i>
                   #include <include/interface-parameters-tos.xml.i>
                   #include <include/interface-parameters-ttl.xml.i>
+                  <leafNode name="ttl">
+                    <defaultValue>16</defaultValue>
+                  </leafNode>
                 </children>
               </node>
               <node name="ipv6">
-- 
cgit v1.2.3