From 9540715c4e087df880283192356e7feecc7e8727 Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Fri, 21 Oct 2016 10:47:17 -0400 Subject: [PATCH] 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 4887e187a6b83ff74feaec65fc839e5ac65f813b) --- manifests/haproxy.pp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 79257ff80..8919ddbc2 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -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], } }