Merge pull request #4769 from resouer/fix-mess

cluster/ubuntu-cluster/configure.sh

@@ -153,42 +153,45 @@ while true; do
     echo
 
 	case $option in
-	    [2] )
+	    [1] )
+            # as both master and minion
         	read -p "IP address of this machine > " myIP
             echo
             etcdName=${mm[$myIP]}
-            inList $etcdName $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  
+            # For minion set MINION IP in default_scripts/kubelet
+            sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
+            
+            # For master set MINION IPs in kube-controller-manager
+	        minionIPs="$minionIPs,$myIP"
+	        sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
+	        
 	        cpMaster
+	        cpMinion
 	        break
 	        ;;
-	    [3] )     
+        [2] )
+            # as master
         	read -p "IP address of this machine > " myIP
-            echo           
+            echo
             etcdName=${mm[$myIP]}
-            inList $etcdName $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
+            # set MINION IPs in kube-controller-manager
+            sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
+	        cpMaster
 	        break
-	        ;;
-	    [1] )
+            ;;
+        [3] )
+            # as minion
         	read -p "IP address of this machine > " myIP
-            echo 
+            echo
             etcdName=${mm[$myIP]}
-            inList $etcdName $myIP 
+            inList $etcdName $myIP
             configEtcd $etcdName $myIP $cluster
-            # For minion set MINION IP in default_scripts/kubelet
-            sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet 
-            
-            # For master set MINION IPs in kube-controller-manager
-	        minionIPs="$minionIPs,$myIP"       
-	        sed -i "s/MINION_IPS/${minionIPs}/g" default_scripts/kube-controller-manager
-	        
-	        cpMaster
+            # set MINION IP in default_scripts/kubelet
+            sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
 	        cpMinion
 	        break
 	        ;;

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                     |