summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2016-12-20 07:28:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-20 07:28:41 +0000
commit3dce9ea92689ace8b88c3996b28adc09d3ab8197 (patch)
treef5102695914271383b07ba7e30ac9401b574bdd5
parenta5e3706c114f43224056fa222276491445ddcf55 (diff)
parent87c0ab0c33bcf487f446291b0dc1e816c5432a14 (diff)
Merge "Use new Kolla image package format"
-rwxr-xr-xcode/install_interface_patch.sh15
-rwxr-xr-xcode/makefile_patch.sh10
2 files changed, 17 insertions, 8 deletions
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index e0ac0876..7ae83b69 100755
--- 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 f4ee9184..e25bc40f 100755
--- 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