From 1ddb58f2f59bc218822661b56dfdac283a88c9e2 Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Fri, 9 Mar 2018 17:06:33 +0800
Subject: [PATCH] fix and store docker engine rpm at build time

Change-Id: I4a07ac98f62de0efab62ec067891285f2325e636
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
 backend/kolla/prepare.sh                       | 2 +-
 code/daisy/daisy/api/backends/kolla/install.py | 6 ++++++
 tools/setup/install/install_func.sh            | 4 +++-
 tools/setup/makefile                           | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/kolla/prepare.sh b/backend/kolla/prepare.sh
index e2b33d5f..8369880e 100755
--- a/backend/kolla/prepare.sh
+++ b/backend/kolla/prepare.sh
@@ -20,7 +20,7 @@ yum -y install epel-release centos-release-openstack-pike
 yum clean all
 #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
+yum install -y $prepare_dir/docker-engine.rpm
 [ "$?" -ne 0 ] && { exit 1; }
 
 mkdir -p /etc/systemd/system/docker.service.d
diff --git a/code/daisy/daisy/api/backends/kolla/install.py b/code/daisy/daisy/api/backends/kolla/install.py
index 4ec8e76a..c0ab657b 100755
--- a/code/daisy/daisy/api/backends/kolla/install.py
+++ b/code/daisy/daisy/api/backends/kolla/install.py
@@ -298,6 +298,12 @@ def _thread_bin(req, cluster_id, host, root_passwd, fp, host_name_ip_list,
            root@%s:%s" % (host_ip, host_prepare_file)
     daisy_cmn.subprocess_call(cmd, fp)
 
+    # scp docker-engine.rpm to the same dir of prepare.sh at target host
+    cmd = "scp -o ConnectTimeout=10 \
+           /var/lib/daisy/tools/docker-engine.rpm \
+           root@%s:%s" % (host_ip, host_prepare_file)
+    daisy_cmn.subprocess_call(cmd, fp)
+
     # scp registry-server.tar to the same dir of prepare.sh at target host
     cmd = "scp -o ConnectTimeout=10 \
            /var/lib/daisy/tools/registry-server.tar \
diff --git a/tools/setup/install/install_func.sh b/tools/setup/install/install_func.sh
index 23612492..7a8972ab 100755
--- a/tools/setup/install/install_func.sh
+++ b/tools/setup/install/install_func.sh
@@ -69,10 +69,12 @@ function kolla_install
   else
       #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
+      yum install -y ./docker-engine.rpm
   fi
   [ "$?" -ne 0 ] && { write_install_log "Install docker-engine failed"; exit 1; }
 
+  cp ./docker-engine.rpm /var/lib/daisy/tools/ # keep it for target hosts
+
   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
diff --git a/tools/setup/makefile b/tools/setup/makefile
index 41970e8e..0f104a0c 100755
--- a/tools/setup/makefile
+++ b/tools/setup/makefile
@@ -61,6 +61,8 @@ bin: binclean binforce
 	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-jasmine-devel*.rpm
 	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp/daisy4nfv-jasmine-debuginfo*.rpm
 
+	curl -sSL https://yum.dockerproject.org/repo/main/centos/7/Packages/docker-engine-17.05.0.ce-1.el7.centos.x86_64.rpm -o $(_TECS_TOOLS_PATH)/setup/bin_temp/docker-engine.rpm
+
 	if [ -e makefile_patch.sh ]; then ./makefile_patch.sh $(_TECS_TOOLS_PATH) ; fi
 	cd $(_TECS_TOOLS_PATH)/setup; chmod +x ./makeself.sh; ./makeself.sh ./bin_temp $(_TECS_TARGET_PATH)/$(PURE_OS_TYPE)/$(ARCH)/$(VER_PREFIX)_$(BIN_TYPE).$(VER_SUFFIX) tecs ./setup.sh
 	$(RM) $(_TECS_TOOLS_PATH)/setup/bin_temp