From 2c63adb20a463882b02e9b95eefb124fb5762929 Mon Sep 17 00:00:00 2001
From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Mon, 19 Mar 2018 10:26:32 +0800
Subject: [PATCH] docker load latest registry server during runtime

Change-Id: I12c336890a3edc2ed53397e935a33b81925db521
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---
 tools/setup/install/install_func.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tools/setup/install/install_func.sh b/tools/setup/install/install_func.sh
index 7a8972ab..41965bbb 100755
--- a/tools/setup/install/install_func.sh
+++ b/tools/setup/install/install_func.sh
@@ -137,22 +137,20 @@ function kolla_install
   git remote update
   git checkout -b stable/$imagebranch remotes/origin/stable/$imagebranch
   cp -r /home/kolla_install/kolla-ansible/etc/kolla /etc
-  # TODO: (huzhj)Use latest registry server from upstream
+
   if [ ! -f "$imagedir/registry-server.tar" ];then
-      cd $imagebakdir
-      if [ -f "$imagebakdir/registry-server.tar" ];then
-          echo "registry-server.tar already exist!"
-      else
-          wget "http://daisycloud.org/static/files/registry-server.tar"
-      fi
-      cp $imagebakdir/registry-server.tar $imagedir
+      # For daisy node
+      docker pull registry:2
+      # For other nodes
+      docker save registry:2 > $imagedir/registry-server.tar
+  else
+      docker load < $imagedir/registry-server.tar
   fi
 
   if [ ! -f "/var/lib/daisy/tools/registry-server.tar" ];then
       cp $imagedir/registry-server.tar /var/lib/daisy/tools/ # keep it for target hosts
   fi
 
-  docker load < $imagedir/registry-server.tar
   rm -rf $imagedir/tmp
   rm -rf $imagedir/registry-*.version
 }