Commit 5ebff99d authored by He Simei's avatar He Simei

fix etcd flag for ubuntu

parent d069a624
...@@ -188,8 +188,8 @@ function create-etcd-opts() { ...@@ -188,8 +188,8 @@ function create-etcd-opts() {
cat <<EOF > ~/kube/default/etcd cat <<EOF > ~/kube/default/etcd
ETCD_OPTS="\ ETCD_OPTS="\
-name infra\ -name infra\
-listen-client-urls http://0.0.0.0:4001\ -listen-client-urls http://127.0.0.1:4001,http://${1}:4001\
-advertise-client-urls http://127.0.0.1:4001" -advertise-client-urls http://${1}:4001"
EOF EOF
} }
...@@ -379,7 +379,7 @@ function provision-master() { ...@@ -379,7 +379,7 @@ function provision-master() {
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
create-etcd-opts create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \ create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \ '${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \ '${ADMISSION_CONTROL}' \
...@@ -481,7 +481,7 @@ function provision-masterandnode() { ...@@ -481,7 +481,7 @@ function provision-masterandnode() {
source ~/kube/util.sh source ~/kube/util.sh
setClusterInfo setClusterInfo
create-etcd-opts create-etcd-opts '${MASTER_IP}'
create-kube-apiserver-opts \ create-kube-apiserver-opts \
'${SERVICE_CLUSTER_IP_RANGE}' \ '${SERVICE_CLUSTER_IP_RANGE}' \
'${ADMISSION_CONTROL}' \ '${ADMISSION_CONTROL}' \
......
...@@ -70,7 +70,7 @@ across reboots and failures. ...@@ -70,7 +70,7 @@ across reboots and failures.
Run: Run:
```sh ```sh
sudo docker -H unix:///var/run/docker-bootstrap.sock run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --data-dir=/var/etcd/data sudo docker -H unix:///var/run/docker-bootstrap.sock run --net=host -d gcr.io/google_containers/etcd:2.2.1 /usr/local/bin/etcd --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://${MASTER_IP}:4001 --data-dir=/var/etcd/data
``` ```
Next, you need to set a CIDR range for flannel. This CIDR should be chosen to be non-overlapping with any existing network you are using: Next, you need to set a CIDR range for flannel. This CIDR should be chosen to be non-overlapping with any existing network you are using:
......
...@@ -121,7 +121,7 @@ start_k8s(){ ...@@ -121,7 +121,7 @@ start_k8s(){
gcr.io/google_containers/etcd:2.2.1 \ gcr.io/google_containers/etcd:2.2.1 \
/usr/local/bin/etcd \ /usr/local/bin/etcd \
--listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 \ --listen-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 \
--advertise-client-urls=http://127.0.0.1:4001,http://${MASTER_IP}:4001 --advertise-client-urls=http://${MASTER_IP}:4001
--data-dir=/var/etcd/data --data-dir=/var/etcd/data
sleep 5 sleep 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment