From 310c49f1ed21dfaac5350961ce6d6d08e88e29d8 Mon Sep 17 00:00:00 2001
From: Adam Bolte <adam.bolte@sitepoint.com>
Date: Wed, 5 Aug 2015 20:02:51 +1000
Subject: [PATCH] Add support for a resolvers section (new to 1.6).

---
 haproxy/templates/haproxy.jinja | 22 +++++++++++++++++++++-
 pillar.example                  | 10 ++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja
index 3f6c548..4af2ec9 100644
--- a/haproxy/templates/haproxy.jinja
+++ b/haproxy/templates/haproxy.jinja
@@ -50,6 +50,21 @@ defaults
     errorfile {{ errorfile[0] }} {{ errorfile[1] }}
   {%- endfor %}
 {%- endif %}
+{%- if salt['pillar.get']('haproxy:resolvers') %}
+
+
+#------------------
+# DNS resolvers
+#------------------
+{%- for resolver in salt['pillar.get']('haproxy:resolvers', {}).iteritems() %}
+resolvers {{ resolver[0] }}
+  {%- if 'options' in resolver[1] %}
+      {%- for option in resolver[1].options %}
+    {{ option }}
+      {%- endfor %}
+  {%- endif %}
+{%- endfor %}
+{%- endif %}
 {%- if 'listens' in salt['pillar.get']('haproxy', {}) %}
 
 
@@ -144,6 +159,11 @@ frontend {{ frontend[1].get('name', frontend[0]) }}
     bind {{ frontend[1].bind }}
       {%- endif %}
     {%- endif %}
+    {%- if 'options' in frontend[1] %}
+      {%- for option in frontend[1].options %}
+    {{ option }}
+      {%- endfor %}
+    {%- endif -%}
     {%- if 'redirects' in frontend[1] %}
       {%- for front_redirect in frontend[1].redirects %}
     redirect {{ front_redirect }}
@@ -207,7 +227,7 @@ backend {{ backend[1].get('name',backend[0]) }}
     {%- endif %}
     {%- if 'servers' in backend[1] %}
       {%- for server in backend[1].servers.iteritems() %}
-    server {{ server[1].get('name',server[0]) }} {{ server[1].host }}:{{ server[1].port }} {{ server[1].check }}
+    server {{ server[1].get('name',server[0]) }} {{ server[1].host }}:{{ server[1].port }} {{ server[1].check }} {{ server[1].get('extra', '') }}
       {%- endfor %}
     {% endif %}
   {%- endfor %}
diff --git a/pillar.example b/pillar.example
index f90debc..a4ab9a9 100644
--- a/pillar.example
+++ b/pillar.example
@@ -45,6 +45,15 @@ haproxy:
       503: /etc/haproxy/errors/503.http
       504: /etc/haproxy/errors/504.http
 
+  {# Suported by HAProxy 1.6 #}
+  resolvers:
+    local_dns:
+      options:
+        - nameserver resolvconf 127.0.0.1:53
+        - resolve_retries 3
+        - timeout retry 1s
+        - hold valid 10s
+
   listens:
     stats:
       bind:
@@ -144,3 +153,4 @@ haproxy:
           host: apiserver2.example.com
           port: 80
           check: check
+          extra: resolvers local_dns resolve-prefer ipv4