aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 00:20:13 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 00:20:13 +0000
commit9bd0fe3445cf9e88d14bd234576b2944a5f7346f (patch)
tree2ed3b7871b730cce6c934580bbe84104ff6a9cdf
parent12e6b07527a9d9c3b1c36b15805a6a1dcced6f5b (diff)
parentb1b418d2a4d39f263899770b3e7e3a07cca2a1b6 (diff)
Merge "Add tunnel timeout for ui proxy container" into stable/ocata
-rw-r--r--manifests/haproxy.pp6
-rw-r--r--releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml6
2 files changed, 12 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 0f1bece..37a7aeb 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 0000000..a1a04c1
--- /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