Merge pull request #33163 from DjangoPeng/Django-patch

Automatic merge from submit-queue

[bug]fix the appending bug

Fix the `DOCKER_OPTS` appending bug. Reference the [issue#33124](https://github.com/kubernetes/kubernetes/issues/33124)
This commit is contained in:
Kubernetes Submit Queue
2016-09-22 16:15:54 -07:00
committed by GitHub

View File

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