x/packstack
Code Issues Proposed changes

Use alternative cirros url until download.cirros-cloud.net is fixed

Browse Source 
Change-Id: I98e3b04e18137809b6ff7806fa43de3ca672e743
Closes-Bug: #1713358
This commit is contained in:
yatin
2017-08-28 12:52:10 +05:30
parent 7775ab65fd
commit 187af0d761
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/plugins/provision_700.py
View File

@@ -32,22 +32,22 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')
DEMO_IMAGE_NAME = 'cirros' DEMO_IMAGE_NAME = 'cirros'
DEMO_IMAGE_URL = ( DEMO_IMAGE_URL = (
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-%s-disk.img' 'http://trunk.rdoproject.org/cirros-0.3.4-%s-disk.img'
% (arch.cirros_arch()) % (arch.cirros_arch())
) )
DEMO_IMAGE_SSH_USER = 'cirros' DEMO_IMAGE_SSH_USER = 'cirros'
DEMO_IMAGE_FORMAT = 'qcow2' DEMO_IMAGE_FORMAT = 'qcow2'
UEC_IMAGE_NAME = 'cirros-uec' UEC_IMAGE_NAME = 'cirros-uec'
UEC_IMAGE_KERNEL_URL = ( UEC_IMAGE_KERNEL_URL = (
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-%s-kernel' 'http://trunk.rdoproject.org/cirros-0.3.4-%s-kernel'
% (arch.cirros_arch()) % (arch.cirros_arch())
) )
UEC_IMAGE_RAMDISK_URL = ( UEC_IMAGE_RAMDISK_URL = (
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-%s-initramfs' 'http://trunk.rdoproject.org/cirros-0.3.4-%s-initramfs'
% (arch.cirros_arch()) % (arch.cirros_arch())
) )
UEC_IMAGE_DISK_URL = ( UEC_IMAGE_DISK_URL = (
'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-%s-disk.img' 'http://trunk.rdoproject.org/cirros-0.3.4-%s-disk.img'
% (arch.cirros_arch()) % (arch.cirros_arch())
) )

6
run_tests.sh
View File

@@ -179,14 +179,16 @@ if [ -f ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz ]; then
tar -xzvf ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/ tar -xzvf ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
else else
echo "No pre-cached uec archive found, downloading..." echo "No pre-cached uec archive found, downloading..."
wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz -P /tmp/cirros/ # FIXME(ykarel) download.cirros-cloud.net domain is expired, see
# https://bugs.launchpad.net/cirros/+bug/1713358
wget --tries=10 http://trunk.rdoproject.org/cirros-0.3.4-x86_64-uec.tar.gz -P /tmp/cirros/
tar -xzvf /tmp/cirros/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/ tar -xzvf /tmp/cirros/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
fi fi
if [ -f ~/cache/files/cirros-0.3.4-x86_64-disk.img ]; then if [ -f ~/cache/files/cirros-0.3.4-x86_64-disk.img ]; then
cp -p ~/cache/files/cirros-0.3.4-x86_64-disk.img /tmp/cirros/ cp -p ~/cache/files/cirros-0.3.4-x86_64-disk.img /tmp/cirros/
else else
echo "No pre-cached disk image found, downloading..." echo "No pre-cached disk image found, downloading..."
wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/cirros/ wget --tries=10 http://trunk.rdoproject.org/cirros-0.3.4-x86_64-disk.img -P /tmp/cirros/
fi fi
echo "Using pre-cached images:" echo "Using pre-cached images:"
find /tmp/cirros -type f -printf "%m %n %u %g %s %t" -exec md5sum \{\} \; find /tmp/cirros -type f -printf "%m %n %u %g %s %t" -exec md5sum \{\} \;