Merge lp:~thedac/charm-helpers/lp1522130 into lp:charm-helpers

[David Ames]

Fix bug #1522130

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

[James Page (james-page)]

I think this needs a fix for the HAproxy context, equivalent to the following:

        if config('haproxy-server-timeout'):
            ctxt['haproxy_server_timeout'] = config('haproxy-server-timeout')

        if config('haproxy-client-timeout'):
            ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')

review: Needs Fixing

[James Page (james-page)]

Could I also request that the whitespace slurping be fixed in the template:

defaults
    log global
    mode tcp
    option tcplog
    option dontlognull
    retries 3
    timeout queue 9000
    timeout connect 9000
timeout client 30000
timeout server 30000
listen stats :8888

This is what currently gets generated.

[David Ames (thedac)]

Added missing context bits for queue and connect timeouts.

Fixed up the whitespace problems in the template.

review: Needs Resubmitting

[James Page (james-page)]

David

Not sure why but your second commit drops a whole load of other stuff from the context module?

review: Needs Fixing

[lp:~thedac/charm-helpers/lp1522130]

495. By David Ames on 2015-12-08

Add haproxy context for new timeout values. Fix template whitespace

[David Ames (thedac)]

Ah, this is correct in the charms themselves. Fixed in CH.

review: Needs Resubmitting

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-11-19 17:33:29 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-12-08 15:59:11 +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 11:20:23 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-12-08 15:59:11 +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