x
/
daisycloud-core
Code Issues Proposed changes

Test installing docker-engine result 

yum.dockerproject.org is slow in China, Daisy should be
more sensitive to errors occured when using that URL.

Change-Id: I4484a1090f0ad9a88b8c9a5bb948a32d9d0e0101
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
This commit is contained in:
Zhijiang Hu 2017-08-21 07:58:07 -04:00
parent b3303a87b0
commit dd58ce348f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/kolla/prepare.sh
View File

@ -13,6 +13,7 @@ yum -y install epel-release
#curl -sSL https://get.docker.io | bash
yum remove -y docker-engine
yum install -y https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-17.05.0.ce-1.el7.centos.x86_64.rpm
[ "$?" -ne 0 ] && { exit 1; }
mkdir -p /etc/systemd/system/docker.service.d
config_path=/etc/systemd/system/docker.service.d/kolla.conf
touch /etc/sysconfig/docker

3
tools/setup/install/install_func.sh
View File

@ -62,6 +62,7 @@ function ip_to_cidr()
function kolla_install
{
write_install_log "Begin install kolla depends..."
check_installed "docker-engine"
if [[ "$has_installed" == "yes" ]];then
echo "docker-engine has been already installed"
@ -70,6 +71,8 @@ function kolla_install
yum remove -y docker-engine
yum install -y https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-17.05.0.ce-1.el7.centos.x86_64.rpm
fi
[ "$?" -ne 0 ] && { write_install_log "Install docker-engine failed"; exit 1; }
mkdir -p /etc/systemd/system/docker.service.d
config_path=/etc/systemd/system/docker.service.d/kolla.conf
echo -e "[Service]\nMountFlags=shared" > $config_path