Merge pull request #6453 from mazswojejzony/master

Ubuntu-cluster updates: configure.sh fix and guide update
pull/6/head
Rohit Jnagal 2015-04-06 11:17:51 -07:00
commit 62f399fb84
2 changed files with 4 additions and 1 deletions

View File

@ -202,6 +202,7 @@ while true; do
# set MINION IP in default_scripts/kubelet
sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kubelet
sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy
cpMinion
break
;;

View File

@ -114,8 +114,10 @@ If you want a node acts as **both running the master and minion**, please choose
2. On any node:
`$ /opt/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.0.0.0/16"}'`
Note the `10.0.0.0/16` is a virtual network address. It has nothing to do with master and minions IP addresses assigned by the cloud provider. In other words even if your master and minions use address from another network (e.g. 172.16.0x) you can still use `10.0.0.0/16` for your virtual network.
> You can use the below command on another node to comfirm if the network setting is correct.
> You can use the below command on another node to confirm if the network setting is correct.
> `$ /opt/bin/etcdctl get /coreos.com/network/config`