Merge pull request #27246 from ZJU-SEL/ubuntu-kube-up

Automatic merge from submit-queue

[ubuntu]honor original docker_opts
This commit is contained in:
k8s-merge-robot 2016-06-27 23:48:49 -07:00 committed by GitHub
commit 46b1a0a24d

View File

@ -58,7 +58,7 @@ function restart_docker {
sudo brctl delbr docker0
source /run/flannel/subnet.env
source /etc/default/docker
echo DOCKER_OPTS=\"${DOCKER_OPTS} -H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock \
--bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}\" > /etc/default/docker
sudo service docker restart