From 5cd98548d0d677f56a3294fed85472cdef4c201d Mon Sep 17 00:00:00 2001
From: Christian Rustmeier <christian.rustmeier@trw.com>
Date: Wed, 4 Sep 2019 16:09:54 +0200
Subject: [PATCH] Implement new config to override service host with consul
 advertise address

---
 config/config.go            |  1 +
 config/default.go           |  1 +
 config/load.go              |  1 +
 fabio.properties            | 11 +++++++++++
 registry/consul/routecmd.go |  4 +++-
 registry/consul/service.go  |  1 +
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/config/config.go b/config/config.go
index cf97eb7ea..2bfd8ed20 100644
--- a/config/config.go
+++ b/config/config.go
@@ -154,6 +154,7 @@ type Consul struct {
 	ChecksRequired                      string
 	ServiceMonitors                     int
 	TLS                                 ConsulTlS
+	UseConsulServiceAddr				bool
 }
 
 type Custom struct {
diff --git a/config/default.go b/config/default.go
index 04fd98230..8614db380 100644
--- a/config/default.go
+++ b/config/default.go
@@ -65,6 +65,7 @@ var defaultConfig = &Config{
 			CheckScheme:                         "http",
 			CheckDeregisterCriticalServiceAfter: "90m",
 			ChecksRequired:                      "one",
+			UseConsulServiceAddr:				 false,
 		},
 		Custom: Custom{
 			Host:               "",
diff --git a/config/load.go b/config/load.go
index 5b2978ead..b894c370b 100644
--- a/config/load.go
+++ b/config/load.go
@@ -173,6 +173,7 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
 	f.StringVar(&cfg.Registry.Consul.KVPath, "registry.consul.kvpath", defaultConfig.Registry.Consul.KVPath, "consul KV path for manual overrides")
 	f.StringVar(&cfg.Registry.Consul.NoRouteHTMLPath, "registry.consul.noroutehtmlpath", defaultConfig.Registry.Consul.NoRouteHTMLPath, "consul KV path for HTML returned when no route is found")
 	f.StringVar(&cfg.Registry.Consul.TagPrefix, "registry.consul.tagprefix", defaultConfig.Registry.Consul.TagPrefix, "prefix for consul tags")
+	f.BoolVar(&cfg.Registry.Consul.UseConsulServiceAddr, "registry.consul.useconsulserviceaddr", defaultConfig.Registry.Consul.UseConsulServiceAddr, "Use consul address instead of service address")
 	f.StringVar(&cfg.Registry.Consul.TLS.KeyFile, "registry.consul.tls.keyfile", defaultConfig.Registry.Consul.TLS.KeyFile, "path to consul key file")
 	f.StringVar(&cfg.Registry.Consul.TLS.CertFile, "registry.consul.tls.certfile", defaultConfig.Registry.Consul.TLS.CertFile, "path to consul cert file")
 	f.StringVar(&cfg.Registry.Consul.TLS.CAFile, "registry.consul.tls.cafile", defaultConfig.Registry.Consul.TLS.CAFile, "path to consul CA file")
diff --git a/fabio.properties b/fabio.properties
index 0794dbdb7..1634f1dca 100644
--- a/fabio.properties
+++ b/fabio.properties
@@ -777,6 +777,17 @@
 # registry.consul.tagprefix = urlprefix-
 
 
+# registry.consul.useconsulserviceaddr configures the behaivour for overriding the address
+#
+# Nomad in combination with Consul often register a service with an internal IP
+# Nomad doesn't not respect currently to register services with the advertisement IP
+# With this setting all services host ip will be ignored and the consul advertise IP
+# will be registered.
+# 
+# The default is
+# registry.consul.useconsulserviceaddr = false
+
+
 # registry.consul.register.enabled configures whether fabio registers itself in consul.
 #
 # Fabio will register itself in consul only if this value is set to "true" which
diff --git a/registry/consul/routecmd.go b/registry/consul/routecmd.go
index 2f2707b7a..5d11b1664 100644
--- a/registry/consul/routecmd.go
+++ b/registry/consul/routecmd.go
@@ -21,6 +21,8 @@ type routecmd struct {
 	prefix string
 
 	env map[string]string
+
+	useConsulAddress bool
 }
 
 func (r routecmd) build() []string {
@@ -40,7 +42,7 @@ func (r routecmd) build() []string {
 			name, addr, port := r.svc.ServiceName, r.svc.ServiceAddress, r.svc.ServicePort
 
 			// use consul node address if service address is not set
-			if addr == "" {
+			if r.useConsulAddress || addr == "" {
 				addr = r.svc.Address
 			}
 
diff --git a/registry/consul/service.go b/registry/consul/service.go
index 083d6d0ee..d3fae6e5f 100644
--- a/registry/consul/service.go
+++ b/registry/consul/service.go
@@ -126,6 +126,7 @@ func (w *ServiceMonitor) serviceConfig(name string, passing map[string]bool) (co
 			svc:    svc,
 			env:    env,
 			prefix: w.config.TagPrefix,
+			useConsulAddress: w.config.UseConsulServiceAddr,
 		}
 		cmds := r.build()