From 89983b6dfe15e8e83f390e9870cc3ddfbf2b8243 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 18 Mar 2015 11:12:15 +1300 Subject: [PATCH] Do not download Fedora cloud image for heat Tempest can now do all heat tests with cirros, and heat functional tests now load a custom test image from tarballs.o.o, so devstack no longer needs to register the fedora cloud image. Depends-On: I6041b8d6e7e9422f6e220d7aef0ca38857085e4b Change-Id: I9b3ea2c157b96dee139a24f0fa6f68f6764a7d67 --- stackrc | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/stackrc b/stackrc index f8d9c43c38..5b2ed70584 100644 --- a/stackrc +++ b/stackrc @@ -560,18 +560,6 @@ case "$VIRT_DRIVER" in IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz"};; esac -# Use 64bit fedora image if heat is enabled -if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then - case "$VIRT_DRIVER" in - libvirt|ironic) - HEAT_CFN_IMAGE_URL=${HEAT_CFN_IMAGE_URL:-"https://download.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2"} - IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL" - ;; - *) - ;; - esac -fi - # Trove needs a custom image for its work if [[ "$ENABLED_SERVICES" =~ 'tr-api' ]]; then case "$VIRT_DRIVER" in @@ -584,17 +572,6 @@ if [[ "$ENABLED_SERVICES" =~ 'tr-api' ]]; then esac fi -# Staging Area for New Images, have them here for at least 24hrs for nodepool -# to cache them otherwise the failure rates in the gate are too high -PRECACHE_IMAGES=$(trueorfalse False PRECACHE_IMAGES) -if [[ "$PRECACHE_IMAGES" == "True" ]]; then - # staging in update for nodepool - IMAGE_URL="https://download.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2" - if ! [[ "$IMAGE_URLS" =~ "$IMAGE_URL" ]]; then - IMAGE_URLS+=",$IMAGE_URL" - fi -fi - # 10Gb default volume backing file size VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-10250M}