Browse code
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
Matt Riedemann authored on 2017/09/28 05:45:25Showing 1 changed files
| ... | ... |
@@ -701,6 +701,11 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then |
| 701 | 701 |
DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.5-x86_64-disk.vhd.tgz}
|
| 702 | 702 |
IMAGE_URLS+="http://ca.downloads.xensource.com/OpenStack/cirros-0.3.5-x86_64-disk.vhd.tgz" |
| 703 | 703 |
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
|
| 704 |
+ fake) |
|
| 705 |
+ # Use the same as the default for libvirt |
|
| 706 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk}
|
|
| 707 |
+ DEFAULT_IMAGE_FILE_NAME=${DEFAULT_IMAGE_FILE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
|
|
| 708 |
+ IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/${DEFAULT_IMAGE_FILE_NAME}";;
|
|
| 704 | 709 |
esac |
| 705 | 710 |
DOWNLOAD_DEFAULT_IMAGES=False |
| 706 | 711 |
fi |