From 97e5a40dbbcaf616bba4dd85d56216777aa77faf Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Tue, 22 Oct 2019 16:00:46 +0200
Subject: [PATCH] Use https for cirros downloads

http is being much slower and anyway using https is a good practice.

Change-Id: Ib9b4194c88cd9065babb81c788ed52b2ee5b8d2f
---
 packstack/plugins/provision_700.py | 8 ++++----
 run_tests.sh                       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py
index b6343ede6..f6212c6de 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 055ae41b4..139ce681e 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -215,14 +215,14 @@ if [ -f ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz ]; then
     tar -xzvf ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -C /tmp/cirros/
 else
     echo "No pre-cached uec archive found, downloading..."
-    wget --tries=10 http://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -P /tmp/cirros/
+    wget --tries=10 https://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -P /tmp/cirros/
     tar -xzvf /tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -C /tmp/cirros/
 fi
 if [ -f ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img ]; then
     cp -p ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img /tmp/cirros/
 else
     echo "No pre-cached disk image found, downloading..."
-    wget --tries=10 http://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img -P /tmp/cirros/
+    wget --tries=10 https://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-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 \{\} \;