From 15e04bb55d3b78b228109a45eed0c24af859bf3d Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Wed, 22 Jun 2016 22:43:20 +0200 Subject: [PATCH] Fix consul catalog issue with dot in serviceName Signed-off-by: Emile Vauge --- templates/consul_catalog.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/consul_catalog.tmpl b/templates/consul_catalog.tmpl index 20d0a8f19..cac301bbd 100644 --- a/templates/consul_catalog.tmpl +++ b/templates/consul_catalog.tmpl @@ -1,7 +1,7 @@ [backends] {{range $index, $node := .Nodes}} {{if ne (getAttribute "enable" $node.Service.Tags "true") "false"}} - [backends.backend-{{getBackend $node}}.servers.{{getBackendName $node $index}}] + [backends."backend-{{getBackend $node}}".servers."{{getBackendName $node $index}}"] url = "{{getAttribute "protocol" $node.Service.Tags "http"}}://{{getBackendAddress $node}}:{{$node.Service.Port}}" {{$weight := getAttribute "backend.weight" $node.Service.Tags ""}} {{with $weight}} @@ -14,20 +14,20 @@ {{$service := .ServiceName}} {{$circuitBreaker := getAttribute "backend.circuitbreaker" .Attributes ""}} {{with $circuitBreaker}} - [backends.backend-{{$service}}.circuitbreaker] + [backends."backend-{{$service}}".circuitbreaker] expression = "{{$circuitBreaker}}" {{end}} {{$loadBalancer := getAttribute "backend.loadbalancer" .Attributes ""}} {{with $loadBalancer}} - [backends.backend-{{$service}}.loadbalancer] + [backends."backend-{{$service}}".loadbalancer] method = "{{$loadBalancer}}" {{end}} {{end}} [frontends] {{range .Services}} - [frontends.frontend-{{.ServiceName}}] + [frontends."frontend-{{.ServiceName}}"] backend = "backend-{{.ServiceName}}" passHostHeader = {{getAttribute "frontend.passHostHeader" .Attributes "true"}} priority = {{getAttribute "frontend.priority" .Attributes "0"}} @@ -37,6 +37,6 @@ "{{.}}", {{end}}] {{end}} - [frontends.frontend-{{.ServiceName}}.routes.route-host-{{.ServiceName}}] + [frontends."frontend-{{.ServiceName}}".routes."route-host-{{.ServiceName}}"] rule = "{{getFrontendRule .}}" {{end}}