From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 17 Apr 2017 15:30:23 +0000 (-0400)
Subject: HAproxy/heat_api: increase timeout to 10m
X-Git-Tag: opnfv-6.0.0~233^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6cb95e6a69677755a070cc73062b70c84452824e;p=apex-puppet-tripleo.git

HAproxy/heat_api: increase timeout to 10m

Default timeout is 2min but it doesn't reflect the rpc_response_timeout
value that we set in THT and instack-undercloud, which is 600 (10 min).

In some cases (in low-memory environments), Heat needs more than 2
minutes to reply to the client, when deploying the overcloud.
It makes sense to increase the timeout to the value of rpc_timeout to
give a chance to Heat to reply to the client, otherwise HAproxy will
kill the connection and send 504 to the client.

Depends-On: I9669d40d86d762101734704fcef153e360767690
Change-Id: I32c71fe7930c8798d306046d6933e4b20c22740c
Related-Bug: 1666072
---

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 {
diff --git a/releasenotes/notes/heat_api_timeout-cbb01242534cec79.yaml b/releasenotes/notes/heat_api_timeout-cbb01242534cec79.yaml
new file mode 100644
index 0000000..a3b7d91
--- /dev/null
+++ b/releasenotes/notes/heat_api_timeout-cbb01242534cec79.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - For Heat API, increase the HAproxy timeout from 2 minutes to 10 minutes so
+    we give a chance to Heat to use the rpc_response_timeout value which is set
+    to 600 by default in TripleO.