From d0a6e490e691ff74ed0895ec1db47dfd149f1f6d Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Thu, 3 Dec 2015 14:54:20 -0800
Subject: [PATCH] Fix lp:1522130 Add sane haproxy timeout defaults and make
 them configurable.

---
 config.yaml                                   | 25 +++++++++++++++++++
 .../contrib/openstack/templates/haproxy.cfg   | 12 +++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/config.yaml b/config.yaml
index 374293a0..98af3eee 100644
--- a/config.yaml
+++ b/config.yaml
@@ -193,3 +193,28 @@ options:
       wait for you to execute the openstack-upgrade action for this charm on
       each unit. If False it will revert to existing behavior of upgrading
       all units on config change.
+  haproxy-server-timeout:
+    type: int
+    default:
+    description: |
+       Server timeout configuration in ms for haproxy, used in HA
+       configurations. If not provided, default value of 30000ms is used.
+  haproxy-client-timeout:
+    type: int
+    default:
+    description: |
+       Client timeout configuration in ms for haproxy, used in HA
+       configurations. If not provided, default value of 30000ms is used.
+  haproxy-queue-timeout:
+    type: int
+    default:
+    description: |
+       Queue timeout configuration in ms for haproxy, used in HA
+       configurations. If not provided, default value of 5000ms is used.
+  haproxy-connect-timeout:
+    type: int
+    default:
+    description: |
+       Connect timeout configuration in ms for haproxy, used in HA
+       configurations. If not provided, default value of 5000ms is used.
+
diff --git a/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg b/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
index ad875f16..4a3e2d7a 100644
--- a/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
+++ b/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
@@ -12,8 +12,16 @@ defaults
     option tcplog
     option dontlognull
     retries 3
-    timeout queue 1000
-    timeout connect 1000
+{% if haproxy_queue_timeout -%}
+    timeout queue {{ haproxy_queue_timeout }}
+{% else -%}
+    timeout queue 5000
+{% endif -%}
+{% if haproxy_connect_timeout -%}
+    timeout connect {{ haproxy_connect_timeout }}
+{% else -%}
+    timeout connect 5000
+{% endif -%}
 {% if haproxy_client_timeout -%}
     timeout client {{ haproxy_client_timeout }}
 {% else -%}