docker load latest registry server during runtime

Using http://daisycloud.org/static/files/registry-server.tar is unsafe.

Please see upstream patch https://review.openstack.org/#/c/554085/ which
implements docker load latest registry server during runtime.

Change-Id: I42f27f522f328619e19a69e0fa796f7b8efa9bd0
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>

diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index d70e18f..3a17f41 100755 (executable)
--- a/code/install_interface_patch.sh
+++ b/code/install_interface_patch.sh
@@ -17,9 +17,7 @@ mkdir -p $imagedir
 if [ ! -e "$imagedir/$imagename" ];then
     cp $imagename $imagedir
 fi
-if [ ! -e "$imagedir/registry-server.tar" ];then
-    cp registry-server.tar $imagedir
-fi
+
 cp CentOS*.iso /var/lib/daisy/kolla
 
 mkdir -p /var/lib/daisy/images/

diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
index 6ccb0ee..665b072 100755 (executable)
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -129,12 +129,10 @@ function check_or_download_file_sha512sum()
 if [ ! -d $CACHE_PATH ]; then mkdir -p $CACHE_PATH ; fi
 check_or_download_file $CACHE_PATH $isourl
 check_or_download_file_sha512sum $CACHE_PATH $imageserver/${imagename} ${imageserver}/${imagename}.sha512sum
-check_or_download_file $CACHE_PATH "http://daisycloud.org/static/files/registry-server.tar"
 check_or_download_file $CACHE_PATH ${cirros_url}
 
 cp $CACHE_PATH/${isoname} ${target_dir}/
 cp $CACHE_PATH/$imagename ${target_dir}/
-cp $CACHE_PATH/registry-server.tar ${target_dir}/
 cp $CACHE_PATH/${cirros_filename} ${target_dir}/
 
 cp $TOOLS_PATH/setup/install_interface_patch.sh ${target_dir}/