openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Add tunnel timeout for ui proxy container"

Browse Source
This commit is contained in:
Jenkins 2017-04-03 22:25:10 +00:00 committed by Gerrit Code Review
commit b3cb0efbda
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/haproxy.pp
View File

@ -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 {

6
releasenotes/notes/add-tunnel-timeout-for-haproxy-ui-0705dfd671f9f487.yaml Normal file
View File

@ -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