diff --git a/cluster/ubuntu-cluster/configure.sh b/cluster/ubuntu-cluster/configure.sh index c37a15929af..1f9b1680154 100755 --- a/cluster/ubuntu-cluster/configure.sh +++ b/cluster/ubuntu-cluster/configure.sh @@ -153,29 +153,8 @@ while true; do echo case $option in - [2] ) - read -p "IP address of this machine > " myIP - echo - etcdName=${mm[$myIP]} - inList $etcdName $myIP - configEtcd $etcdName $myIP $cluster - # set MINION IPs in kube-controller-manager - sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager - cpMaster - break - ;; - [3] ) - read -p "IP address of this machine > " myIP - echo - etcdName=${mm[$myIP]} - inList $etcdName $myIP - configEtcd $etcdName $myIP $cluster - # set MINION IP in default_scripts/kubelet - sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet - cpMinion - break - ;; [1] ) + # as both master and minion read -p "IP address of this machine > " myIP echo etcdName=${mm[$myIP]} @@ -192,6 +171,30 @@ while true; do cpMinion break ;; + [2] ) + # as master + read -p "IP address of this machine > " myIP + echo + etcdName=${mm[$myIP]} + inList $etcdName $myIP + configEtcd $etcdName $myIP $cluster + # set MINION IPs in kube-controller-manager + sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager + cpMaster + break + ;; + [3] ) + # as minion + read -p "IP address of this machine > " myIP + echo + etcdName=${mm[$myIP]} + inList $etcdName $myIP + configEtcd $etcdName $myIP $cluster + # set MINION IP in default_scripts/kubelet + sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet + cpMinion + break + ;; * ) echo "Please choose 1 or 2 or 3." ;; diff --git a/docs/getting-started-guides/README.md b/docs/getting-started-guides/README.md index 806a0b9e120..1135f5d0e14 100644 --- a/docs/getting-started-guides/README.md +++ b/docs/getting-started-guides/README.md @@ -14,6 +14,7 @@ AWS | Saltstack | Ubuntu | [docs](../../docs/getting-started-guide Vmware | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/coreos.md) | Community (@kelseyhightower) | Azure | Saltstack | Ubuntu | [docs](../../docs/getting-started-guides/azure.md) | Community (@jeffmendoza) | Bare-metal | custom | Ubuntu | [docs](../../docs/getting-started-guides/ubuntu_single_node.md) | Community (@jainvipin) | +Bare-metal | custom | Ubuntu Cluster | [docs](../../docs/getting-started-guides/ubuntu_multinodes_cluster.md) | community (@resouer @WIZARD-CXY) | use k8s version 0.10.1 Local | | | [docs](../../docs/getting-started-guides/locally.md) | Inactive | Ovirt | | | [docs](../../docs/getting-started-guides/ovirt.md) | Inactive | Rackspace | CoreOS | CoreOS | [docs](../../docs/getting-started-guides/rackspace.md) | Inactive |