github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15293 from resouer/patch-8

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-12 02:47:55 -07:00
parent 5730332b60 fcfed739b9
commit ee1ff452c0
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/getting-started-guides/docker-multinode/master.sh
View File

@@ -121,12 +121,17 @@ start_k8s(){
fi fi
ifconfig docker0 down ifconfig docker0 down
yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker
;;
ubuntu|debian) ubuntu|debian)
DOCKER_CONF="/etc/default/docker" DOCKER_CONF="/etc/default/docker"
echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF} echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
ifconfig docker0 down ifconfig docker0 down
apt-get install bridge-utils && brctl delbr docker0 && service docker restart apt-get install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
*)
echo "Unsupported operations system $lsb_dist"
exit 1
;;
esac esac
# sleep a little bit # sleep a little bit

4
docs/getting-started-guides/docker-multinode/worker.sh
View File

@@ -130,6 +130,10 @@ start_k8s() {
ifconfig docker0 down ifconfig docker0 down
apt-get install bridge-utils && brctl delbr docker0 && service docker restart apt-get install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
*)
echo "Unsupported operations system $lsb_dist"
exit 1
;;
esac esac
# sleep a little bit # sleep a little bit