openstack
/
puppet-tripleo
Code Issues Proposed changes

Increase haproxy client/server timeout for swift-proxy 

The upload and extraction for the plan tarball to swift can take
longer than the default one minute in slower environments. Doubling
the timeout to two minutes has proven to help.

This is only a partial fix, because the error reporting for this
issue also needs to be improved.

Change-Id: I06592d38fdfefacc8bdf76289a0bfa20eb33a89b
Partial-Bug: 1635269
(cherry picked from commit 4887e187a6)
This commit is contained in:
John Trowbridge 2016-10-21 10:47:17 -04:00 committed by Emilien Macchi
parent 99ce66c0c8
commit 9540715c4e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/haproxy.pp
View File

@ -748,12 +748,17 @@ class tripleo::haproxy (
}
if $swift_proxy_server {
$swift_proxy_server_listen_options = {
'timeout client' => '2m',
'timeout server' => '2m',
}
::tripleo::haproxy::endpoint { 'swift_proxy_server':
public_virtual_ip => $public_virtual_ip,
internal_ip => hiera('swift_proxy_vip', $controller_virtual_ip),
service_port => $ports[swift_proxy_port],
ip_addresses => hiera('swift_proxy_node_ips', $controller_hosts_real),
server_names => hiera('swift_proxy_node_names', $controller_hosts_names_real),
listen_options => $swift_proxy_server_listen_options,
public_ssl_port => $ports[swift_proxy_ssl_port],
}
}