summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-18 06:58:02 +0000
committerGerrit Code Review <review@openstack.org>2017-04-18 06:58:02 +0000
commitbdbe277b5d086b61b2762099a6432824e3a4dd93 (patch)
tree5b2d24e56c543b7d650166d60e209360f0102b54 /manifests
parentf3b4c34b2f93c068d2f473cfae3ed1494803c473 (diff)
parent6cb95e6a69677755a070cc73062b70c84452824e (diff)
Merge "HAproxy/heat_api: increase timeout to 10m"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index a32c8d9..a6bd1eb 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -1185,13 +1185,17 @@ class tripleo::haproxy (
$heat_api_vip = hiera('heat_api_vip', $controller_virtual_ip)
$heat_ip_addresses = hiera('heat_api_node_ips', $controller_hosts_real)
+ $heat_timeout_options = {
+ 'timeout client' => '10m',
+ 'timeout server' => '10m',
+ }
if $service_certificate {
$heat_ssl_options = {
'rsprep' => "^Location:\\ http://${public_virtual_ip}(.*) Location:\\ https://${public_virtual_ip}\\1",
}
- $heat_options = merge($default_listen_options, $heat_ssl_options)
+ $heat_options = merge($default_listen_options, $heat_ssl_options, $heat_timeout_options)
} else {
- $heat_options = $default_listen_options
+ $heat_options = merge($default_listen_options, $heat_timeout_options)
}
if $heat_api {