From 8872cb8ec92b1853f13f8145c07df4aa55e79921 Mon Sep 17 00:00:00 2001
From: Brad Marshall <brad.marshall@canonical.com>
Date: Thu, 26 Nov 2015 17:24:05 +1000
Subject: [PATCH] [bradm] Expose haproxy server and client timeouts via config.

---
 config.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config.yaml b/config.yaml
index 36cbd31..4362f05 100644
--- a/config.yaml
+++ b/config.yaml
@@ -265,3 +265,15 @@ 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.