From 1db23109ad18085bcfc7be3ac0a1f60bc8dde073 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Fri, 31 Oct 2014 14:46:39 -0700 Subject: [PATCH] *: name node{1,2,3} -> infra{1,2,3} Be consistent with the naming in documentations. --- Documentation/0.5/api.md | 2 +- Documentation/0.5/other_apis.md | 4 ++-- Procfile | 8 ++++---- hack/insta-discovery/Procfile | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/0.5/api.md b/Documentation/0.5/api.md index 550e92489..371c3e783 100644 --- a/Documentation/0.5/api.md +++ b/Documentation/0.5/api.md @@ -896,7 +896,7 @@ curl http://127.0.0.1:2379/v2/stats/leader "startTime": "2014-10-24T13:15:51.184719899-07:00", "uptime": "7m17.859616962s" }, - "name": "node1", + "name": "infra1", "recvAppendRequestCnt": 3949, "recvBandwidthRate": 561.5729321100841, "recvPkgRate": 9.008227977383449, diff --git a/Documentation/0.5/other_apis.md b/Documentation/0.5/other_apis.md index 7f1a81c12..05b4a8905 100644 --- a/Documentation/0.5/other_apis.md +++ b/Documentation/0.5/other_apis.md @@ -13,7 +13,7 @@ Return an HTTP 200 OK response code and a representation of all members in the e "members": [ { "id":"272e204152", - "name":"node1", + "name":"infra1", "peerURLs":[ "http://10.0.0.10:2379" ], @@ -23,7 +23,7 @@ Return an HTTP 200 OK response code and a representation of all members in the e }, { "id":"2225373f43", - "name":"node2", + "name":"infra2", "peerURLs":[ "http://127.0.0.11:2379" ], diff --git a/Procfile b/Procfile index aca23763e..2b0f3c5cb 100644 --- a/Procfile +++ b/Procfile @@ -1,5 +1,5 @@ # Use goreman to run `go get github.com/mattn/goreman` -etcd1: bin/etcd -name node1 -listen-client-urls http://127.0.0.1:4001 -advertise-client-urls http://127.0.0.1:4001 -listen-peer-urls http://127.0.0.1:7001 -initial-advertise-peer-urls http://127.0.0.1:7001 -initial-cluster-token etcd-cluster-1 -initial-cluster 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003' -initial-cluster-state new -etcd2: bin/etcd -name node2 -listen-client-urls http://127.0.0.1:4002 -advertise-client-urls http://127.0.0.1:4002 -listen-peer-urls http://127.0.0.1:7002 -initial-advertise-peer-urls http://127.0.0.1:7002 -initial-cluster-token etcd-cluster-1 -initial-cluster 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003' -initial-cluster-state new -etcd3: bin/etcd -name node3 -listen-client-urls http://127.0.0.1:4003 -advertise-client-urls http://127.0.0.1:4003 -listen-peer-urls http://127.0.0.1:7003 -initial-advertise-peer-urls http://127.0.0.1:7003 -initial-cluster-token etcd-cluster-1 -initial-cluster 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003' -initial-cluster-state new -proxy: bin/etcd -proxy=on -bind-addr 127.0.0.1:8080 -initial-cluster 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003' +etcd1: bin/etcd -name infra1 -listen-client-urls http://127.0.0.1:4001 -advertise-client-urls http://127.0.0.1:4001 -listen-peer-urls http://127.0.0.1:7001 -initial-advertise-peer-urls http://127.0.0.1:7001 -initial-cluster-token etcd-cluster-1 -initial-cluster 'infra1=http://localhost:7001,infra2=http://localhost:7002,infra3=http://localhost:7003' -initial-cluster-state new +etcd2: bin/etcd -name infra2 -listen-client-urls http://127.0.0.1:4002 -advertise-client-urls http://127.0.0.1:4002 -listen-peer-urls http://127.0.0.1:7002 -initial-advertise-peer-urls http://127.0.0.1:7002 -initial-cluster-token etcd-cluster-1 -initial-cluster 'infra1=http://localhost:7001,infra2=http://localhost:7002,infra3=http://localhost:7003' -initial-cluster-state new +etcd3: bin/etcd -name infra3 -listen-client-urls http://127.0.0.1:4003 -advertise-client-urls http://127.0.0.1:4003 -listen-peer-urls http://127.0.0.1:7003 -initial-advertise-peer-urls http://127.0.0.1:7003 -initial-cluster-token etcd-cluster-1 -initial-cluster 'infra1=http://localhost:7001,infra2=http://localhost:7002,infra3=http://localhost:7003' -initial-cluster-state new +proxy: bin/etcd -proxy=on -bind-addr 127.0.0.1:8080 -initial-cluster 'infra1=http://localhost:7001,infra2=http://localhost:7002,infra3=http://localhost:7003' diff --git a/hack/insta-discovery/Procfile b/hack/insta-discovery/Procfile index 8647535b3..32ff0686c 100644 --- a/hack/insta-discovery/Procfile +++ b/hack/insta-discovery/Procfile @@ -1,4 +1,4 @@ # Use goreman to run `go get github.com/mattn/goreman` -etcd1: ../../bin/etcd -name node1 -listen-client-urls http://127.0.0.1:4001 -advertise-client-urls http://127.0.0.1:4001 -listen-peer-urls http://127.0.0.1:7001 -initial-advertise-peer-urls http://127.0.0.1:7001 -etcd2: ../../bin/etcd -name node2 -listen-client-urls http://127.0.0.1:4002 -advertise-client-urls http://127.0.0.1:4002 -listen-peer-urls http://127.0.0.1:7002 -initial-advertise-peer-urls http://127.0.0.1:7002 -etcd3: ../../bin/etcd -name node3 -listen-client-urls http://127.0.0.1:4003 -advertise-client-urls http://127.0.0.1:4003 -listen-peer-urls http://127.0.0.1:7003 -initial-advertise-peer-urls http://127.0.0.1:7003 +etcd1: ../../bin/etcd -name infra1 -listen-client-urls http://127.0.0.1:4001 -advertise-client-urls http://127.0.0.1:4001 -listen-peer-urls http://127.0.0.1:7001 -initial-advertise-peer-urls http://127.0.0.1:7001 +etcd2: ../../bin/etcd -name infra2 -listen-client-urls http://127.0.0.1:4002 -advertise-client-urls http://127.0.0.1:4002 -listen-peer-urls http://127.0.0.1:7002 -initial-advertise-peer-urls http://127.0.0.1:7002 +etcd3: ../../bin/etcd -name infra3 -listen-client-urls http://127.0.0.1:4003 -advertise-client-urls http://127.0.0.1:4003 -listen-peer-urls http://127.0.0.1:7003 -initial-advertise-peer-urls http://127.0.0.1:7003