diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-03 22:25:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-03 22:25:10 +0000 |
| commit | b3cb0efbdac5e4ea5bdc26737173f767aa529ea8 (patch) | |
| tree | a32194f066f184a80d7eba1e46c99c9fc72356e0 | |
| parent | 3aa86a4ea3c2406f79d6283cbb158f67136b5e9a (diff) | |
| parent | e8125cb3640e0fe74b8617aaf55686d5645c8f7f (diff) | |
Merge "Add tunnel timeout for ui proxy container"
| -rw-r--r-- | manifests/haproxy.pp | 6 | ||||
| -rw-r--r-- | releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 92edd71..ca83407 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -1595,6 +1595,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 |