Merge lp:~thedac/charm-helpers/haproxy-options into lp:charm-helpers

[David Ames]

Allow for backend haproxy options

[Billy Olsen (billy-olsen)]

LGTM

review: Approve

[Billy Olsen (billy-olsen)]

I'm also curious if any of the services may need to set something which is not an option? For instance, the retries count may need to be specified differently for different backends but the syntax is not "option retries", it is instead "retries <count>" so the backend couldn't tune it as necessary.

[David Ames (thedac)]

Good point. I'll rearrange that.

[lp:~thedac/charm-helpers/haproxy-options]

729. By David Ames on 2017-03-30

Allow for non 'option' options

[Billy Olsen (billy-olsen)]

Okay, really LGTM this time.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2017-03-28 22:18:10 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2017-03-30 18:38:49 +0000
@@ -60,6 +60,15 @@
 {% for frontend in frontends -%}
 backend {{ service }}_{{ frontend }}
     balance leastconn
+    {% if backend_options -%}
+    {% if backend_options[service] -%}
+    {% for option in backend_options[service] -%}
+    {% for key, value in option.items() -%}
+    {{ key }} {{ value }}
+    {% endfor -%}
+    {% endfor -%}
+    {% endif -%}
+    {% endif -%}
     {% for unit, address in frontends[frontend]['backends'].items() -%}
     server {{ unit }} {{ address }}:{{ ports[1] }} check
     {% endfor %}