From fee6b90f502d8e334bb1c07fc59f08c71a411c81 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 2 Jun 2016 11:07:49 +0000
Subject: [PATCH 1/2] Update haproxy template and temporarily point at fork of
 charms.openstack

---
 templates/haproxy.cfg | 38 +++++++++++++++++++-------------------
 wheelhouse.txt        |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/templates/haproxy.cfg b/templates/haproxy.cfg
index 8721d8a..212bae8 100644
--- a/templates/haproxy.cfg
+++ b/templates/haproxy.cfg
@@ -1,6 +1,6 @@
 global
-    log {{ local_host }} local0
-    log {{ local_host }} local1 notice
+    log {{ options.local_host }} local0
+    log {{ options.local_host }} local1 notice
     maxconn 20000
     user haproxy
     group haproxy
@@ -12,52 +12,52 @@ defaults
     option tcplog
     option dontlognull
     retries 3
-{%- if haproxy_queue_timeout %}
-    timeout queue {{ haproxy_queue_timeout }}
+{%- if options.haproxy_queue_timeout %}
+    timeout queue {{ options.haproxy_queue_timeout }}
 {%- else %}
     timeout queue 5000
 {%- endif %}
-{%- if haproxy_connect_timeout %}
-    timeout connect {{ haproxy_connect_timeout }}
+{%- if options.haproxy_connect_timeout %}
+    timeout connect {{ options.haproxy_connect_timeout }}
 {%- else %}
     timeout connect 5000
 {%- endif %}
-{%- if haproxy_client_timeout %}
-    timeout client {{ haproxy_client_timeout }}
+{%- if options.haproxy_client_timeout %}
+    timeout client {{ options.haproxy_client_timeout }}
 {%- else %}
     timeout client 30000
 {%- endif %}
-{%- if haproxy_server_timeout %}
-    timeout server {{ haproxy_server_timeout }}
+{%- if options.haproxy_server_timeout %}
+    timeout server {{ options.haproxy_server_timeout }}
 {%- else %}
     timeout server 30000
 {%- endif %}
 
-listen stats {{ stat_port }}
+listen stats {{ options.stat_port }}
     mode http
     stats enable
     stats hide-version
     stats realm Haproxy\ Statistics
     stats uri /
-    stats auth admin:password
+    stats auth admin:{{ options.haproxy_stat_password }}
 
-{% if frontends -%}
-{% for service, ports in service_ports.items() -%}
+{% if cluster.cluster_hosts -%}
+{% for service, ports in options.service_ports.items() -%}
 frontend tcp-in_{{ service }}
     bind *:{{ ports[0] }}
     {% if ipv6 -%}
     bind :::{{ ports[0] }}
     {% endif -%}
-    {% for frontend in frontends -%}
-    acl net_{{ frontend }} dst {{ frontends[frontend]['network'] }}
+    {% for frontend in cluster.cluster_hosts -%}
+    acl net_{{ frontend }} dst {{ cluster.cluster_hosts[frontend]['network'] }}
     use_backend {{ service }}_{{ frontend }} if net_{{ frontend }}
     {% endfor -%}
-    default_backend {{ service }}_{{ default_backend }}
+    default_backend {{ service }}_{{ options.local_address }}
 
-{% for frontend in frontends -%}
+{% for frontend in cluster.cluster_hosts -%}
 backend {{ service }}_{{ frontend }}
     balance leastconn
-    {% for unit, address in frontends[frontend]['backends'].items() -%}
+    {% for unit, address in cluster.cluster_hosts[frontend]['backends'].items() -%}
     server {{ unit }} {{ address }}:{{ ports[1] }} check
     {% endfor %}
 {% endfor -%}
diff --git a/wheelhouse.txt b/wheelhouse.txt
index a5cc61f..98a753f 100644
--- a/wheelhouse.txt
+++ b/wheelhouse.txt
@@ -1,3 +1,3 @@
 netifaces>=0.10.4
 #charms_openstack
-git+https://github.com/openstack-charmers/charms.openstack.git#egg=charms.openstack
+git+https://github.com/gnuoy/charms.openstack.git@feature/ha-support#egg=charms.openstack

From 08b835a93c9752324ee3f3de0c70b816f37948ef Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Fri, 3 Jun 2016 08:13:41 +0000
Subject: [PATCH 2/2] Point wheelhouse back

---
 wheelhouse.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wheelhouse.txt b/wheelhouse.txt
index 98a753f..a5cc61f 100644
--- a/wheelhouse.txt
+++ b/wheelhouse.txt
@@ -1,3 +1,3 @@
 netifaces>=0.10.4
 #charms_openstack
-git+https://github.com/gnuoy/charms.openstack.git@feature/ha-support#egg=charms.openstack
+git+https://github.com/openstack-charmers/charms.openstack.git#egg=charms.openstack