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)

Merge pull request #33163 from DjangoPeng/Django-patch
6d08910d · Kubernetes Submit Queue · GitHub · 9cecc1a8 · cee76a6f · 6d08910d
Commit 6d08910d authored Sep 22, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

reconfDocker.sh cluster/ubuntu/reconfDocker.sh +1 -1

No files found.
--- a/cluster/ubuntu/reconfDocker.sh
+++ b/cluster/ubuntu/reconfDocker.sh
@@ -59,7 +59,7 @@ function restart_docker {

  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 \
+  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
  sudo service docker restart
 }