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

[Brad Marshall]

Expose haproxy server and client timeouts via config.

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

charm_unit_test #14022 neutron-api-next for brad-marshall mp279711
    UNIT OK: passed

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

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

charm_lint_check #15035 neutron-api-next for brad-marshall mp279711
    LINT OK: passed

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

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

charm_amulet_test #8199 neutron-api-next for brad-marshall mp279711
    AMULET OK: passed

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

[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

158. By Brad Marshall on 2015-12-07

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

=== modified file 'config.yaml'
--- config.yaml	2015-11-09 14:06:56 +0000
+++ config.yaml	2015-12-07 00:44:17 +0000
@@ -457,3 +457,15 @@
     type: boolean
     default: False
     description: Enable port security extension for ML2 plugin (>= kilo).
+  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.