From 5f985045f4f69945bfa378994977a16b9cbc1fc7 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 2 Sep 2015 11:49:27 +0000 Subject: [PATCH] set default docker storage driver to devicemapper and fix DOCKER_OPTS passing --- cluster/centos/minion/scripts/docker.sh | 2 +- cluster/centos/util.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/centos/minion/scripts/docker.sh b/cluster/centos/minion/scripts/docker.sh index 74039e601c1..14fb52a4556 100755 --- a/cluster/centos/minion/scripts/docker.sh +++ b/cluster/centos/minion/scripts/docker.sh @@ -20,7 +20,7 @@ DOCKER_OPTS=${1:-""} DOCKER_CONFIG=/opt/kubernetes/cfg/docker cat <$DOCKER_CONFIG -DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --selinux-enabled=false ${DOCKER_OPTS}" +DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock -s devicemapper --selinux-enabled=false ${DOCKER_OPTS}" EOF cat </usr/lib/systemd/system/docker.service diff --git a/cluster/centos/util.sh b/cluster/centos/util.sh index 0fd54d788bd..d9baa43ddaf 100755 --- a/cluster/centos/util.sh +++ b/cluster/centos/util.sh @@ -274,7 +274,7 @@ function provision-minion() { echo "chmod -R +x /opt/kubernetes/bin" echo "bash ${KUBE_TEMP}/minion/scripts/flannel.sh ${ETCD_SERVERS} ${FLANNEL_NET}" - echo "bash ${KUBE_TEMP}/minion/scripts/docker.sh ${DOCKER_OPTS}" + echo "bash ${KUBE_TEMP}/minion/scripts/docker.sh \"${DOCKER_OPTS}\"" echo "bash ${KUBE_TEMP}/minion/scripts/kubelet.sh ${master_ip} ${minion_ip}" echo "bash ${KUBE_TEMP}/minion/scripts/proxy.sh ${master_ip}"