diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-03-19 10:23:35 +0800 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2018-03-19 11:02:23 +0800 |
| commit | e791b002ecc023b2df94fbc72f7673403268b65a (patch) | |
| tree | 68625ecf98c1b9d0a688c7fc25b9f5fd5e1bc89e | |
| parent | 0f6f12141ae7997713cbab0296038579376b476d (diff) | |
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>
| -rwxr-xr-x | code/install_interface_patch.sh | 4 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh index d70e18f6..3a17f414 100755 --- 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 6ccb0ee0..665b0729 100755 --- 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}/ |