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

[Brad Marshall]

Expose haproxy server and client timeouts via config.

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

charm_lint_check #14419 swift-proxy-next for brad-marshall mp278670
    LINT OK: passed

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

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

charm_unit_test #13441 swift-proxy-next for brad-marshall mp278670
    UNIT OK: passed

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

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

charm_amulet_test #8034 swift-proxy-next for brad-marshall mp278670
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv08
ERROR:root:Make target returned non-zero.

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

[Ryan Beisner (1chb1n)]

FYI, undercloud issue caused amulet fail on #8034.

Rerunning tests...

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

charm_amulet_test #8053 swift-proxy-next for brad-marshall mp278670
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8053/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-09-23 16:28:19 +0000
+++ config.yaml	2015-11-26 07:26:47 +0000
@@ -265,3 +265,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.