Commit ee1ff452 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #15293 from resouer/patch-8

Auto commit by PR queue bot
parents 5730332b fcfed739
...@@ -121,12 +121,17 @@ start_k8s(){ ...@@ -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
......
...@@ -130,6 +130,10 @@ start_k8s() { ...@@ -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
......
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