Merge lp:~thedac/charms/trusty/ceilometer/lp1522130 into lp:~openstack-charmers-archive/charms/trusty/ceilometer/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_lint_check #15104 ceilometer-next for thedac mp279959
    LINT OK: passed

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

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

charm_unit_test #14088 ceilometer-next for thedac mp279959
    UNIT OK: passed

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

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

charm_amulet_test #8225 ceilometer-next for thedac mp279959
    AMULET OK: passed

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

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-10-10 22:37:50 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-12-08 23:35:20 +0000
@@ -626,6 +626,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 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-01-13 12:04:23 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-12-08 23:35:20 +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

=== modified file 'config.yaml'
--- config.yaml	2015-09-22 15:34:48 +0000
+++ config.yaml	2015-12-08 23:35:20 +0000
@@ -161,3 +161,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.