From 187af0d761f3fce28f1e0cd73c3dc4806992a4fd Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Mon, 28 Aug 2017 12:52:10 +0530
Subject: [PATCH] Use alternative cirros url until download.cirros-cloud.net is
 fixed

Change-Id: I98e3b04e18137809b6ff7806fa43de3ca672e743
Closes-Bug: #1713358
---
 packstack/plugins/provision_700.py | 8 ++++----
 run_tests.sh                       | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packstack/plugins/provision_700.py b/packstack/plugins/provision_700.py
index f5005b26f..9691246cf 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.4/cirros-0.3.4-%s-disk.img'
+    'http://trunk.rdoproject.org/cirros-0.3.4-%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.4/cirros-0.3.4-%s-kernel'
+    'http://trunk.rdoproject.org/cirros-0.3.4-%s-kernel'
     % (arch.cirros_arch())
 )
 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())
 )
 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())
 )
 
diff --git a/run_tests.sh b/run_tests.sh
index 39ef678e7..b104adbde 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -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/
 else
     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/
 fi
 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/
 else
     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
 echo "Using pre-cached images:"
 find /tmp/cirros -type f -printf "%m %n %u %g %s  %t" -exec md5sum \{\} \;