3 files changed, 19 insertions, 0 deletions
diff --git a/interface-definitions/include/haproxy/timeout-tunnel.xml.i b/interface-definitions/include/haproxy/timeout-tunnel.xml.i
new file mode 100644
index 000000000..ea6be1505
--- /dev/null
+++ b/interface-definitions/include/haproxy/timeout-tunnel.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from haproxy/timeout-tunnel.xml.i -->
+<leafNode name="tunnel">
+  <properties>
+    <help>Set the maximum inactivity time on the client and server side for tunnels</help>
+    <valueHelp>
+      <format>u32:1-86400</format>
+      <description>Tunnel timeout in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-86400"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/haproxy/timeout.xml.i b/interface-definitions/include/haproxy/timeout.xml.i
index a3a5a8a3e..a84e32001 100644
--- a/interface-definitions/include/haproxy/timeout.xml.i
+++ b/interface-definitions/include/haproxy/timeout.xml.i
@@ -7,6 +7,7 @@
     #include <include/haproxy/timeout-check.xml.i>
     #include <include/haproxy/timeout-connect.xml.i>
     #include <include/haproxy/timeout-server.xml.i>
+    #include <include/haproxy/timeout-tunnel.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/load-balancing_haproxy.xml.in b/interface-definitions/load-balancing_haproxy.xml.in
index f3baf86ca..e9d42ef90 100644
--- a/interface-definitions/load-balancing_haproxy.xml.in
+++ b/interface-definitions/load-balancing_haproxy.xml.in
@@ -399,6 +399,10 @@
               <leafNode name="server">
                 <defaultValue>50</defaultValue>
               </leafNode>
+              #include <include/haproxy/timeout-tunnel.xml.i>
+              <leafNode name="tunnel">
+                <defaultValue>300</defaultValue>
+              </leafNode>
             </children>
           </node>
           #include <include/interface/vrf.xml.i>