Skip to content

Commit

Permalink
Merge pull request #340 from hookenz/master
Browse files Browse the repository at this point in the history
Default etcd backend port to 2379
  • Loading branch information
mattatcha committed Feb 24, 2016
2 parents ff38f7d + 39e5331 commit 0a99627
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/user/backends.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Using the prefix from the Registry URI, service definitions are stored as:
Etcd works similar to Consul KV, except supports service TTLs. It also currently
doesn't support service attributes/tags.

If no address and port is specified, it will default to `127.0.0.1:4001`.
If no address and port is specified, it will default to `127.0.0.1:2379`.

Using the prefix from the Registry URI, service definitions are stored as:

Expand All @@ -96,7 +96,7 @@ Using the prefix from the Registry URI, service definitions are stored as:
SkyDNS 2 uses etcd, so this backend writes service definitions in a format compatible with SkyDNS 2.
The path may not be omitted and must be a valid DNS domain for SkyDNS.

If no address and port is specified, it will default to `127.0.0.1:4001`.
If no address and port is specified, it will default to `127.0.0.1:2379`.

Using a Registry URI with the domain `cluster.local`, service definitions are stored as:

Expand Down
2 changes: 1 addition & 1 deletion etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
if uri.Host != "" {
urls = append(urls, "http://"+uri.Host)
} else {
urls = append(urls, "http://127.0.0.1:4001")
urls = append(urls, "http://127.0.0.1:2379")
}

res, err := http.Get(urls[0] + "/version")
Expand Down

0 comments on commit 0a99627

Please sign in to comment.