From 4418d1fb5be8cf21850675c9fef6c566cde672cd Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 24 Apr 2014 16:06:51 -0400 Subject: [PATCH] update heat image to the 64bit one we cached previously start caching the next 64bit update image to deal with heat breaks we see from time to time. Change-Id: If62840f4807151ada1598046fb7ad47c7210df12 --- stackrc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/stackrc b/stackrc index 957302d0ca..95ee7799dc 100644 --- a/stackrc +++ b/stackrc @@ -340,28 +340,18 @@ case "$VIRT_DRIVER" in IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};; esac -# if heat is enabled, bring in a linux image with cfn enabled -# TODO(sdague) this next block can be removed after nodepool has the 64bit image in it's cache -HEAT_FETCHED_TEST_IMAGE=${HEAT_FETCHED_TEST_IMAGE:-""} -if [[ "$HEAT_FETCHED_TEST_IMAGE" == "Fedora-i386-20-20131211.1-sda" ]]; then - HEAT_CFN_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" - IMAGE_URLS+=",https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" -elif [[ "$HEAT_FETCHED_TEST_IMAGE" == "Fedora-x86_64-20-20131211.1-sda" ]]; then - HEAT_CFN_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2" - IMAGE_URLS+=",https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2" +# Use 64bit fedora image if heat is enabled +if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then + HEAT_CFN_IMAGE_URL=${HEAT_CFN_IMAGE_URL:-"https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2"} + IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL" fi -# Uncomment after nodepool changes land -# if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then -# HEAT_CFN_IMAGE_URL=${HEAT_CFN_IMAGE_URL:-"https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2"} -# IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL" -# 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 - IMAGE_URLS+=",https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2" + # staging in update for nodepool + IMAGE_URLS+=",https://dl.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/Fedora-x86_64-20-20140407-sda.qcow2" fi # 10Gb default volume backing file size