summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Trowbridge <trown@redhat.com>2016-10-21 10:47:17 -0400
committerJohn Trowbridge <trown@redhat.com>2016-10-21 10:51:44 -0400
commit4887e187a6b83ff74feaec65fc839e5ac65f813b (patch)
treecb53241a555c29e735679a33c652ced44f31457c
parente76a15ad54b79d3be7406d25199dc3a16ec5ca01 (diff)
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
-rw-r--r--manifests/haproxy.pp5
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 3ad10eb..723fcb6 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -920,12 +920,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],
service_network => $swift_proxy_server_network,
}