From ba4830b84e529943353e71f375ab6538f37efa02 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 27 Sep 2017 16:45:25 -0400 Subject: [PATCH] Download default image when using VIRT_DRIVER=fake Change f119121d21fa0446197b26378091677daac1606a removed the default image to download which meant if you were using the fake virt driver, no image would get downloaded and tempest setup would fail. This adds it back in but doesn't use a wildcard. The default image is the same as before, but uses the variables that are also used for the default libvirt image case. Change-Id: I80eddd0d3a99572ed494b5cd36fed8ceb4d05d77 Closes-Bug: #1720003 --- stackrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stackrc b/stackrc index e7e584b8f2..61555173db 100644 --- a/stackrc +++ b/stackrc @@ -701,6 +701,11 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.5-x86_64-disk.vhd.tgz} IMAGE_URLS+="http://ca.downloads.xensource.com/OpenStack/cirros-0.3.5-x86_64-disk.vhd.tgz" IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";; + fake) + # Use the same as the default for libvirt + DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk} + DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img} + IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";; esac DOWNLOAD_DEFAULT_IMAGES=False fi