@@ -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}