Merge lp:~thedac/charms/trusty/cinder/lp1522130 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[David Ames]

Fix bug #1522130

Add sane defaults for timeout connect and queue and make them configurable.

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

charm_unit_test #13815 cinder-next for thedac mp279530
    UNIT OK: passed

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

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

charm_lint_check #14819 cinder-next for thedac mp279530
    LINT OK: passed

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

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

charm_amulet_test #8142 cinder-next for thedac mp279530
    AMULET OK: passed

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

[lp:~thedac/charms/trusty/cinder/lp1522130]

137. By David Ames on 2015-12-07

Add haproxy context for new timeout values. Fix template whitespace

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

charm_lint_check #15047 cinder-next for thedac mp279530
    LINT OK: passed

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

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

charm_unit_test #14034 cinder-next for thedac mp279530
    UNIT OK: passed

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

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

charm_amulet_test #8210 cinder-next for thedac mp279530
    AMULET OK: passed

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

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

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-09-29 15:52:10 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-12-07 23:12:07 +0000
@@ -625,6 +625,12 @@
         if config('haproxy-client-timeout'):
             ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
 
+        if config('haproxy-queue-timeout'):
+            ctxt['haproxy_queue_timeout'] = config('haproxy-queue-timeout')
+
+        if config('haproxy-connect-timeout'):
+            ctxt['haproxy_connect_timeout'] = config('haproxy-connect-timeout')
+
         if config('prefer-ipv6'):
             ctxt['ipv6'] = True
             ctxt['local_host'] = 'ip6-localhost'

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-01-13 14:36:44 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-12-07 23:12:07 +0000
@@ -12,19 +12,26 @@
     option tcplog
     option dontlognull
     retries 3
-    timeout queue 1000
-    timeout connect 1000
-{% if haproxy_client_timeout -%}
+{%- 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 -%}
+{%- else %}
     timeout client 30000
-{% endif -%}
-
-{% if haproxy_server_timeout -%}
+{%- endif %}
+{%- if haproxy_server_timeout %}
     timeout server {{ haproxy_server_timeout }}
-{% else -%}
+{%- else %}
     timeout server 30000
-{% endif -%}
+{%- endif %}
 
 listen stats {{ stat_port }}
     mode http