diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py index c8f175548..e8cd280e1 100644 --- a/packstack/plugins/provision_700.py +++ b/packstack/plugins/provision_700.py @@ -32,22 +32,22 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue') DEMO_IMAGE_NAME = 'cirros' DEMO_IMAGE_URL = ( - 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' + 'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' % (arch.cirros_arch()) ) DEMO_IMAGE_SSH_USER = 'cirros' DEMO_IMAGE_FORMAT = 'qcow2' UEC_IMAGE_NAME = 'cirros-uec' UEC_IMAGE_KERNEL_URL = ( - 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-kernel' + 'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-kernel' % (arch.cirros_arch()) ) UEC_IMAGE_RAMDISK_URL = ( - 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-initramfs' + 'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-initramfs' % (arch.cirros_arch()) ) UEC_IMAGE_DISK_URL = ( - 'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' + 'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img' % (arch.cirros_arch()) ) diff --git a/run_tests.sh b/run_tests.sh index 5c5636f54..19526bc04 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -185,14 +185,14 @@ if [ -f ~/cache/files/cirros-0.3.5-x86_64-uec.tar.gz ]; then tar -xzvf ~/cache/files/cirros-0.3.5-x86_64-uec.tar.gz -C /tmp/cirros/ else echo "No pre-cached uec archive found, downloading..." - wget --tries=10 http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz -P /tmp/cirros/ + wget --tries=10 https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz -P /tmp/cirros/ tar -xzvf /tmp/cirros/cirros-0.3.5-x86_64-uec.tar.gz -C /tmp/cirros/ fi if [ -f ~/cache/files/cirros-0.3.5-x86_64-disk.img ]; then cp -p ~/cache/files/cirros-0.3.5-x86_64-disk.img /tmp/cirros/ else echo "No pre-cached disk image found, downloading..." - wget --tries=10 http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P /tmp/cirros/ + wget --tries=10 https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P /tmp/cirros/ fi echo "Using pre-cached images:" find /tmp/cirros -type f -printf "%m %n %u %g %s %t" -exec md5sum \{\} \; diff --git a/tests/scenario001.sh b/tests/scenario001.sh index c4be4553d..4293da1dc 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -40,6 +40,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \ --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \ --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ + --provision-image-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ --provision-demo=y \ --provision-tempest=y \ --run-tempest=y \ diff --git a/tests/scenario002.sh b/tests/scenario002.sh index a6d791e62..1a9ee2046 100755 --- a/tests/scenario002.sh +++ b/tests/scenario002.sh @@ -45,6 +45,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \ --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \ --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ + --provision-image-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ --provision-demo=y \ --provision-tempest=y \ --run-tempest=y \ diff --git a/tests/scenario003.sh b/tests/scenario003.sh index f036186d1..a668d455c 100755 --- a/tests/scenario003.sh +++ b/tests/scenario003.sh @@ -43,6 +43,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \ --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \ --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ + --provision-image-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \ --provision-demo=y \ --provision-tempest=y \ --run-tempest=y \