diff --git a/Documentation/proxy.md b/Documentation/proxy.md index 2f2082d12..f7a9851a3 100644 --- a/Documentation/proxy.md +++ b/Documentation/proxy.md @@ -48,9 +48,9 @@ The proxy will be listening on `listen-client-urls` and forward requests to the To start a proxy that will connect to a statically defined etcd cluster, specify the `initial-cluster` flag: ``` -etcd -proxy on \ --listen-client-urls http://127.0.0.1:8080 \ --initial-cluster infra0=http://10.0.1.10:2380,infra1=http://10.0.1.11:2380,infra2=http://10.0.1.12:2380 +etcd --proxy on \ +--listen-client-urls http://127.0.0.1:8080 \ +--initial-cluster infra0=http://10.0.1.10:2380,infra1=http://10.0.1.11:2380,infra2=http://10.0.1.12:2380 ``` ### Start an etcd proxy with the discovery service @@ -59,14 +59,14 @@ If you bootstrap an etcd cluster using the [discovery service][discovery-service To start a proxy using the discovery service, specify the `discovery` flag. The proxy will wait until the etcd cluster defined at the `discovery` url finishes bootstrapping, and then start to forward the requests. ``` -etcd -proxy on \ --listen-client-urls http://127.0.0.1:8080 \ --discovery https://discovery.etcd.io/3e86b59982e49066c5d813af1c2e2579cbf573de +etcd --proxy on \ +--listen-client-urls http://127.0.0.1:8080 \ +--discovery https://discovery.etcd.io/3e86b59982e49066c5d813af1c2e2579cbf573de \ ``` ## Fallback to proxy mode with discovery service -If you bootstrap an etcd cluster using [discovery service][discovery-service] with more than the expected number of etcd members, the extra etcd processes will fall back to being `readwrite` proxies by default. They will forward the requests to the cluster as described above. For example, if you create a discovery url with `size=5`, and start ten etcd processes using that same discovery url, the result will be a cluster with five etcd members and five proxies. Note that this behaviour can be disabled with the `proxy-fallback` flag. +If you bootstrap an etcd cluster using [discovery service][discovery-service] with more than the expected number of etcd members, the extra etcd processes will fall back to being `readwrite` proxies by default. They will forward the requests to the cluster as described above. For example, if you create a discovery url with `size=5`, and start ten etcd processes using that same discovery url, the result will be a cluster with five etcd members and five proxies. Note that this behaviour can be disabled with the `discovery-fallback='exit'` flag. ## Promote a proxy to a member of etcd cluster @@ -132,11 +132,11 @@ Finally, start the reconfigured member and make sure it joins the cluster correc $ export ETCD_NAME="infra1" $ export ETCD_INITIAL_CLUSTER="infra0=http://10.0.1.10:2380,infra1=http://10.0.1.11:2380" $ export ETCD_INITIAL_CLUSTER_STATE=existing -$ etcd -listen-client-urls http://10.0.1.11:2379 \ --advertise-client-urls http://10.0.1.11:2379 \ --listen-peer-urls http://10.0.1.11:2380 \ --initial-advertise-peer-urls http://10.0.1.11:2380 \ --data-dir %data_dir% +$ etcd --listen-client-urls http://10.0.1.11:2379 \ +--advertise-client-urls http://10.0.1.11:2379 \ +--listen-peer-urls http://10.0.1.11:2380 \ +--initial-advertise-peer-urls http://10.0.1.11:2380 \ +--data-dir %data_dir% ``` If you are running etcd under systemd, you should modify the service file with correct configuration and restart the service: