From b1b418d2a4d39f263899770b3e7e3a07cca2a1b6 Mon Sep 17 00:00:00 2001
From: Dan Trainor <dan.trainor@gmail.com>
Date: Thu, 30 Mar 2017 20:36:04 -0400
Subject: [PATCH] Add tunnel timeout for ui proxy container

Add an explicit tunnel timeout configuration option to increase the
tunnel timeout for persistent socket connections from two minutes (2m)
to one hour (3600s).  A configuration was already present to apply a
tunnel timeout to the zaqar_ws endpoint, but that only applies to
connections made directly to the zaqar_ws endpoint directly.  Since UI
now uses mod_proxy to proxy WebSocket connections for Zaqar, the timeout
is now applied for the same reasons to the ui haproxy server.

Change-Id: If749dc9148ccf8f2fa12b56b6ed6740f42e65aeb
Closes-Bug: 1672826
(cherry picked from commit e8125cb3640e0fe74b8617aaf55686d5645c8f7f)
---
 manifests/haproxy.pp                                        | 6 ++++++
 .../add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 0f1bece5c..37a7aeba8 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1592,6 +1592,12 @@ class tripleo::haproxy (
       server_names      => $controller_hosts_names_real,
       mode              => 'http',
       public_ssl_port   => $ports[ui_ssl_port],
+      listen_options    => {
+        # NOTE(dtrainor): in addition to the zaqar_ws endpoint, the HTTPS
+        # (443/tcp) endpoint that answers for the UI must also use a long-lived
+        # tunnel timeout for the same reasons mentioned above.
+        'timeout' => ['tunnel 3600s'],
+      },
     }
   }
   if $contrail_config {
diff --git a/releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml b/releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml
new file mode 100644
index 000000000..a1a04c196
--- /dev/null
+++ b/releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Add a tunnel timeout to the HAProxy tripleo-ui configuration to ensure 
+    Zaqar WebSocket tunnels persist longer than two minutes
+    https://bugs.launchpad.net/tripleo/+bug/1672826