From 72996097b63dfa6c364558948305ea36f5e903a2 Mon Sep 17 00:00:00 2001
From: Kamil Sambor <ksambor@redhat.com>
Date: Wed, 10 Oct 2018 16:37:58 +0200
Subject: [PATCH] Add posibilities to set default timeouts for octavia

Expose timeouts values for octavia frontend client
and backend member by parameters:
* OctaviaTimeoutClientData
* OctaviaTimeoutMemberConnect
* OctaviaTimeoutMemberData
* OctaviaTimeoutTcpInspect

Change-Id: I07afa4e15c595f984cba23672f910993495851ff
Closes-Bug: 1797130
Depends-On: https://review.openstack.org/609420/
---
 puppet/services/octavia-worker.yaml           | 20 +++++++++++++++++++
 .../notes/bug-1797130-b40e402a9bffe2f0.yaml   | 13 ++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 releasenotes/notes/bug-1797130-b40e402a9bffe2f0.yaml

diff --git a/puppet/services/octavia-worker.yaml b/puppet/services/octavia-worker.yaml
index b72af7260a..c2935a0e28 100644
--- a/puppet/services/octavia-worker.yaml
+++ b/puppet/services/octavia-worker.yaml
@@ -84,6 +84,22 @@ parameters:
     description: The project name for the keystone Octavia account.
     type: string
     default: 'service'
+  OctaviaTimeoutClientData:
+    default: 50000
+    description: Frontend client inactivity timeout.
+    type: number
+  OctaviaTimeoutMemberConnect:
+    default: 5000
+    description: Backend member connection timeout.
+    type: number
+  OctaviaTimeoutMemberData:
+    default: 50000
+    description: Backend member inactivity timeout.
+    type: number
+  OctaviaTimeoutTcpInspect:
+    default: 0
+    description: Time to wait for TCP packets for content inspection.
+    type: number
 
 conditions:
   octavia_topology_unset: {equals : [{get_param: OctaviaLoadBalancerTopology}, ""]}
@@ -119,6 +135,10 @@ outputs:
             octavia::worker::manage_nova_flavor: {get_param: OctaviaManageNovaFlavor}
             octavia::worker::nova_flavor_config: {get_param: OctaviaFlavorProperties}
             octavia::worker::enable_ssh_access: true
+            octavia::worker::timeout_client_data: {get_param: OctaviaTimeoutClientData}
+            octavia::worker::timeout_member_connect: {get_param: OctaviaTimeoutMemberConnect}
+            octavia::worker::timeout_member_data: {get_param: OctaviaTimeoutMemberData}
+            octavia::worker::timeout_tcp_inspect: {get_param: OctaviaTimeoutTcpInspect}
             octavia::certificates::client_cert: {get_param: OctaviaClientCertFile}
           -
             if:
diff --git a/releasenotes/notes/bug-1797130-b40e402a9bffe2f0.yaml b/releasenotes/notes/bug-1797130-b40e402a9bffe2f0.yaml
new file mode 100644
index 0000000000..c645b7088c
--- /dev/null
+++ b/releasenotes/notes/bug-1797130-b40e402a9bffe2f0.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - |
+    Octavia default timeouts for backend member and frontend client
+    can be set by params exposed in template:
+
+     * `OctaviaTimeoutClientData`: Frontend client inactivity timeout
+     * `OctaviaTimeoutMemberConnect`: Backend member connection timeout
+     * `OctaviaTimeoutMemberData`: Backend member inactivity timeout
+     * `OctaviaTimeoutTcpInspect`: Time to wait for TCP packets for content inspection
+
+     The value for all of these options is expected to be in milliseconds.
+