Browse Source

*: name node{1,2,3} -> infra{1,2,3}

Be consistent with the naming in documentations.
Yicheng Qin 11 years ago
parent
commit
1db23109ad
4 changed files with 10 additions and 10 deletions
  1. 1 1
      Documentation/0.5/api.md
  2. 2 2
      Documentation/0.5/other_apis.md
  3. 4 4
      Procfile
  4. 3 3
      hack/insta-discovery/Procfile

+ 1 - 1
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",
         "startTime": "2014-10-24T13:15:51.184719899-07:00",
         "uptime": "7m17.859616962s"
         "uptime": "7m17.859616962s"
     },
     },
-    "name": "node1",
+    "name": "infra1",
     "recvAppendRequestCnt": 3949,
     "recvAppendRequestCnt": 3949,
     "recvBandwidthRate": 561.5729321100841,
     "recvBandwidthRate": 561.5729321100841,
     "recvPkgRate": 9.008227977383449,
     "recvPkgRate": 9.008227977383449,

+ 2 - 2
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": [
         "members": [
                 {
                 {
                     "id":"272e204152",
                     "id":"272e204152",
-                    "name":"node1",
+                    "name":"infra1",
                     "peerURLs":[
                     "peerURLs":[
                         "http://10.0.0.10:2379"
                         "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",
                     "id":"2225373f43",
-                    "name":"node2",
+                    "name":"infra2",
                     "peerURLs":[
                     "peerURLs":[
                         "http://127.0.0.11:2379"
                         "http://127.0.0.11:2379"
                     ],
                     ],

+ 4 - 4
Procfile

@@ -1,5 +1,5 @@
 # Use goreman to run `go get github.com/mattn/goreman`
 # 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'

+ 3 - 3
hack/insta-discovery/Procfile

@@ -1,4 +1,4 @@
 # Use goreman to run `go get github.com/mattn/goreman`
 # 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