From cfaf82ba252e59fce6e124ec9ad2d2ecd71e6564 Mon Sep 17 00:00:00 2001
From: Laurent Hoss <laurent.hoss@teralytics.ch>
Date: Wed, 30 Aug 2017 16:37:59 +0200
Subject: [PATCH 1/2] if consul_client_address set (in consul.conf), in the
 upstart script do not set -client flag (from unconfigurable interface 'eth0')

---
 templates/consul.conf.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/consul.conf.j2 b/templates/consul.conf.j2
index 5554367..5b384d1 100644
--- a/templates/consul.conf.j2
+++ b/templates/consul.conf.j2
@@ -24,7 +24,8 @@ script
 {% if consul_dynamic_bind %}
     -bind=$BIND \
 {% endif %}
-{% if consul_client_address_bind %}
+{# In case 'consul_client_address' is set, will only configure it in consul.conf file, not here #}
+{% if consul_client_address_bind and not consul_client_address %}
     -client=$CLIENT_BIND \
 {% endif %}
     -config-dir={{ consul_config_dir }} \

From 7f869533aec8ca941b08d3c5d028d75c318a4bad Mon Sep 17 00:00:00 2001
From: Vincenzo <vinc.pii@gmail.com>
Date: Wed, 30 Aug 2017 18:57:54 +0200
Subject: [PATCH 2/2] Comment clarification

---
 templates/consul.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/consul.conf.j2 b/templates/consul.conf.j2
index 5b384d1..d97c459 100644
--- a/templates/consul.conf.j2
+++ b/templates/consul.conf.j2
@@ -24,7 +24,7 @@ script
 {% if consul_dynamic_bind %}
     -bind=$BIND \
 {% endif %}
-{# In case 'consul_client_address' is set, will only configure it in consul.conf file, not here #}
+{# In case 'consul_client_address' is set, will only configure it in /etc/consul.conf, not here #}
 {% if consul_client_address_bind and not consul_client_address %}
     -client=$CLIENT_BIND \
 {% endif %}