diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-06 00:20:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-06 00:20:13 +0000 |
| commit | 9bd0fe3445cf9e88d14bd234576b2944a5f7346f (patch) | |
| tree | 2ed3b7871b730cce6c934580bbe84104ff6a9cdf /manifests | |
| parent | 12e6b07527a9d9c3b1c36b15805a6a1dcced6f5b (diff) | |
| parent | b1b418d2a4d39f263899770b3e7e3a07cca2a1b6 (diff) | |
Merge "Add tunnel timeout for ui proxy container" into stable/ocata
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/haproxy.pp | 6 |
1 files changed, 6 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 { |