diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-22 21:45:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-22 21:45:27 +0000 |
| commit | d897f2005c67b1c0288b19e296cc5b7088453620 (patch) | |
| tree | 4ceb46f1ec2f1f0c0504d107fae54e9f2da5a858 | |
| parent | b23f48877557c58b138bac488e8d75e3f7139217 (diff) | |
| parent | 4887e187a6b83ff74feaec65fc839e5ac65f813b (diff) | |
Merge "Increase haproxy client/server timeout for swift-proxy"
| -rw-r--r-- | manifests/haproxy.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 4747d57..400c508 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -934,12 +934,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, } |