From c719aa3db888598181753657ca7c8f4de4b042e1 Mon Sep 17 00:00:00 2001 From: Ed Robinson Date: Mon, 11 Jul 2016 12:36:35 +0100 Subject: [PATCH] Fix default etcd port Fixes #508 --- configuration.go | 2 +- docs/toml.md | 2 +- examples/compose-etcd.yml | 2 +- examples/etcd-config.sh | 32 +++++++++++++-------------- integration/etcd_test.go | 2 +- integration/fixtures/etcd/simple.toml | 4 ++-- traefik.sample.toml | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configuration.go b/configuration.go index 4dfa40115..a30e66e11 100644 --- a/configuration.go +++ b/configuration.go @@ -251,7 +251,7 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { // default Etcd var defaultEtcd provider.Etcd defaultEtcd.Watch = true - defaultEtcd.Endpoint = "127.0.0.1:400" + defaultEtcd.Endpoint = "127.0.0.1:2379" defaultEtcd.Prefix = "/traefik" defaultEtcd.Constraints = []types.Constraint{} diff --git a/docs/toml.md b/docs/toml.md index b3106aacf..b95646072 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -793,7 +793,7 @@ Træfɪk can be configured to use Etcd as a backend configuration: # # Required # -endpoint = "127.0.0.1:4001" +endpoint = "127.0.0.1:2379" # Enable watch Etcd changes # diff --git a/examples/compose-etcd.yml b/examples/compose-etcd.yml index 62df465d3..83ba52f72 100644 --- a/examples/compose-etcd.yml +++ b/examples/compose-etcd.yml @@ -1,4 +1,4 @@ etcd: image: gcr.io/google_containers/etcd:2.2.1 net: host - command: ['/usr/local/bin/etcd', '--addr=127.0.0.1:4001', '--bind-addr=0.0.0.0:4001', '--data-dir=/var/etcd/data'] \ No newline at end of file + command: ['/usr/local/bin/etcd', '--addr=127.0.0.1:2379', '--bind-addr=0.0.0.0:2379', '--data-dir=/var/etcd/data'] diff --git a/examples/etcd-config.sh b/examples/etcd-config.sh index 648ad970b..6515f9b76 100755 --- a/examples/etcd-config.sh +++ b/examples/etcd-config.sh @@ -1,25 +1,25 @@ #!/bin/sh # backend 1 -curl -i -H "Accept: application/json" -X PUT -d value="NetworkErrorRatio() > 0.5" http://localhost:4001/v2/keys/traefik/backends/backend1/circuitbreaker/expression -curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.2:80" http://localhost:4001/v2/keys/traefik/backends/backend1/servers/server1/url -curl -i -H "Accept: application/json" -X PUT -d value="10" http://localhost:4001/v2/keys/traefik/backends/backend1/servers/server1/weight -curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.3:80" http://localhost:4001/v2/keys/traefik/backends/backend1/servers/server2/url -curl -i -H "Accept: application/json" -X PUT -d value="1" http://localhost:4001/v2/keys/traefik/backends/backend1/servers/server2/weight +curl -i -H "Accept: application/json" -X PUT -d value="NetworkErrorRatio() > 0.5" http://localhost:2379/v2/keys/traefik/backends/backend1/circuitbreaker/expression +curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.2:80" http://localhost:2379/v2/keys/traefik/backends/backend1/servers/server1/url +curl -i -H "Accept: application/json" -X PUT -d value="10" http://localhost:2379/v2/keys/traefik/backends/backend1/servers/server1/weight +curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.3:80" http://localhost:2379/v2/keys/traefik/backends/backend1/servers/server2/url +curl -i -H "Accept: application/json" -X PUT -d value="1" http://localhost:2379/v2/keys/traefik/backends/backend1/servers/server2/weight # backend 2 -curl -i -H "Accept: application/json" -X PUT -d value="drr" http://localhost:4001/v2/keys/traefik/backends/backend2/loadbalancer/method -curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.4:80" http://localhost:4001/v2/keys/traefik/backends/backend2/servers/server1/url -curl -i -H "Accept: application/json" -X PUT -d value="1" http://localhost:4001/v2/keys/traefik/backends/backend2/servers/server1/weight -curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.5:80" http://localhost:4001/v2/keys/traefik/backends/backend2/servers/server2/url -curl -i -H "Accept: application/json" -X PUT -d value="2" http://localhost:4001/v2/keys/traefik/backends/backend2/servers/server2/weight +curl -i -H "Accept: application/json" -X PUT -d value="drr" http://localhost:2379/v2/keys/traefik/backends/backend2/loadbalancer/method +curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.4:80" http://localhost:2379/v2/keys/traefik/backends/backend2/servers/server1/url +curl -i -H "Accept: application/json" -X PUT -d value="1" http://localhost:2379/v2/keys/traefik/backends/backend2/servers/server1/weight +curl -i -H "Accept: application/json" -X PUT -d value="http://172.17.0.5:80" http://localhost:2379/v2/keys/traefik/backends/backend2/servers/server2/url +curl -i -H "Accept: application/json" -X PUT -d value="2" http://localhost:2379/v2/keys/traefik/backends/backend2/servers/server2/weight # frontend 1 -curl -i -H "Accept: application/json" -X PUT -d value="backend2" http://localhost:4001/v2/keys/traefik/frontends/frontend1/backend -curl -i -H "Accept: application/json" -X PUT -d value="http" http://localhost:4001/v2/keys/traefik/frontends/frontend1/entrypoints -curl -i -H "Accept: application/json" -X PUT -d value="Host:test.localhost" http://localhost:4001/v2/keys/traefik/frontends/frontend1/routes/test_1/rule +curl -i -H "Accept: application/json" -X PUT -d value="backend2" http://localhost:2379/v2/keys/traefik/frontends/frontend1/backend +curl -i -H "Accept: application/json" -X PUT -d value="http" http://localhost:2379/v2/keys/traefik/frontends/frontend1/entrypoints +curl -i -H "Accept: application/json" -X PUT -d value="Host:test.localhost" http://localhost:2379/v2/keys/traefik/frontends/frontend1/routes/test_1/rule # frontend 2 -curl -i -H "Accept: application/json" -X PUT -d value="backend1" http://localhost:4001/v2/keys/traefik/frontends/frontend2/backend -curl -i -H "Accept: application/json" -X PUT -d value="http" http://localhost:4001/v2/keys/traefik/frontends/frontend2/entrypoints -curl -i -H "Accept: application/json" -X PUT -d value="Path:/test" http://localhost:4001/v2/keys/traefik/frontends/frontend2/routes/test_2/rule +curl -i -H "Accept: application/json" -X PUT -d value="backend1" http://localhost:2379/v2/keys/traefik/frontends/frontend2/backend +curl -i -H "Accept: application/json" -X PUT -d value="http" http://localhost:2379/v2/keys/traefik/frontends/frontend2/entrypoints +curl -i -H "Accept: application/json" -X PUT -d value="Path:/test" http://localhost:2379/v2/keys/traefik/frontends/frontend2/routes/test_2/rule diff --git a/integration/etcd_test.go b/integration/etcd_test.go index 316d989b3..4698e7729 100644 --- a/integration/etcd_test.go +++ b/integration/etcd_test.go @@ -30,7 +30,7 @@ func (s *EtcdSuite) SetUpSuite(c *check.C) { s.composeProject.Start(c) etcd.Register() - url := s.composeProject.Container(c, "etcd").NetworkSettings.IPAddress + ":4001" + url := s.composeProject.Container(c, "etcd").NetworkSettings.IPAddress + ":2379" kv, err := libkv.NewStore( store.ETCD, []string{url}, diff --git a/integration/fixtures/etcd/simple.toml b/integration/fixtures/etcd/simple.toml index bbc35e3c6..d3180c30a 100644 --- a/integration/fixtures/etcd/simple.toml +++ b/integration/fixtures/etcd/simple.toml @@ -8,9 +8,9 @@ logLevel = "DEBUG" [etcd] - endpoint = "{{.EtcdHost}}:4001" + endpoint = "{{.EtcdHost}}:2379" prefix = "/traefik" watch = true [web] - address = ":8081" \ No newline at end of file + address = ":8081" diff --git a/traefik.sample.toml b/traefik.sample.toml index 88f610cad..55ec2556b 100644 --- a/traefik.sample.toml +++ b/traefik.sample.toml @@ -405,7 +405,7 @@ # # Required # -# endpoint = "127.0.0.1:4001" +# endpoint = "127.0.0.1:2379" # Enable watch Etcd changes # @@ -545,4 +545,4 @@ # [frontends.frontend3] # entrypoints = ["http", "https"] # overrides defaultEntryPoints # backend = "backend2" -# rule = "Path: /test, /other" \ No newline at end of file +# rule = "Path: /test, /other"