Merge lp:~brad-marshall/charms/trusty/cinder/haproxy-add-timeout into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Brad Marshall]

Expose haproxy server and client timeouts via config.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #14020 cinder-next for brad-marshall mp279708
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/14020/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #15033 cinder-next for brad-marshall mp279708
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/15033/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8196 cinder-next for brad-marshall mp279708
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13792369/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8196/

[Liam Young (gnuoy)]

thedacs branch has landed into /next which supercedes this one, but thank you for taking the time to raise the mp.

review: Disapprove

Unmerged revisions

136. By Brad Marshall on 2015-12-07

[brad-marshall] Expose haproxy server and client timeouts via config.

=== modified file 'config.yaml'
--- config.yaml	2015-08-31 16:25:22 +0000
+++ config.yaml	2015-12-07 00:43:23 +0000
@@ -292,3 +292,15 @@
       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.