Use new Kolla image package format

Change-Id: I542630e0eb26e6a0630683186a645642411009e1
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>

diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index e0ac087..7ae83b6 100755 (executable)
--- a/code/install_interface_patch.sh
+++ b/code/install_interface_patch.sh
@@ -8,12 +8,17 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-mkdir -p /home/kolla_install/docker
-if [ ! -e "/home/kolla_install/docker/registry-mitaka-latest.tgz" ];then
-    cp registry-mitaka-latest.tgz /home/kolla_install/docker
+imagebranch="newton"
+imageversion="latest"
+imageserver="http://120.24.17.215"
+imagedir="/home/kolla_install/docker/"
+imagename="kolla-image-$imagebranch-$imageversion.tgz"
+mkdir -p $imagedir
+if [ ! -e "$imagedir/$imagename" ];then
+    cp $imagename $imagedir
 fi
-if [ ! -e "/home/kolla_install/docker/registry-server.tar" ];then
-    cp registry-server.tar /home/kolla_install/docker
+if [ ! -e "$imagedir/registry-server.tar" ];then
+    cp registry-server.tar $imagedir
 fi
 cp CentOS-7-x86_64-Minimal-1511.iso /var/lib/daisy/kolla
 

diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
index f4ee918..e25bc40 100755 (executable)
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -10,18 +10,22 @@
 ##############################################################################
 TOOLS_PATH=$1
 CACHE_PATH=/home/cache
+imagebranch="newton"
+imageversion="latest"
+imageserver="http://120.24.17.215"
+imagename="kolla-image-$imagebranch-$imageversion.tgz"
 if [ ! -d $CACHE_PATH ]; then mkdir -p $CACHE_PATH ; fi
 if [ ! -f $CACHE_PATH/CentOS-7-x86_64-Minimal-1511.iso ]; then
     wget -P $CACHE_PATH "http://ftp.osuosl.org/pub/centos/7/isos/x86_64/CentOS-7-x86_64-Minimal-1511.iso"
 fi
-if [ ! -f $CACHE_PATH/registry-mitaka-latest.tgz ]; then
-    wget -P $CACHE_PATH "http://daisycloud.org/static/files/registry-mitaka-latest.tgz"
+if [ ! -f $CACHE_PATH/$imagename ]; then
+    wget -P $CACHE_PATH "$imageserver/$imagename"
 fi
 if [ ! -f $CACHE_PATH/registry-server.tar ]; then
     wget -P $CACHE_PATH "http://daisycloud.org/static/files/registry-server.tar"
 fi
 cp $CACHE_PATH/CentOS-7-x86_64-Minimal-1511.iso $TOOLS_PATH/setup/bin_temp/
-cp $CACHE_PATH/registry-mitaka-latest.tgz $TOOLS_PATH/setup/bin_temp/
+cp $CACHE_PATH/$imagename $TOOLS_PATH/setup/bin_temp/
 cp $CACHE_PATH/registry-server.tar $TOOLS_PATH/setup/bin_temp/
 cp $TOOLS_PATH/setup/install_interface_patch.sh $TOOLS_PATH/setup/bin_temp/
 chmod +x $TOOLS_PATH/setup/bin_temp/install_interface_patch.sh