openstack/devstack
Code Issues Proposed changes

Revert "Update used Fedora images to version 21"

Browse Source 
This breaks check-heat-dsvm-functional-mysql which assumes the previous glance image name.

This reverts commit 21dbe993348b794a1b77c4f9db0081d1cc32138c.

Change-Id: I77749f3f9f1a64719447ddd25ee95bc6d3afa5b3
This commit is contained in:
Steve Baker 2014-12-12 00:52:59 +00:00
parent 21dbe99334
commit 6d012cf16f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stackrc
View File

@ -552,7 +552,7 @@ esac
if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
case "$VIRT_DRIVER" in case "$VIRT_DRIVER" in
libvirt|ironic) libvirt|ironic)
HEAT_CFN_IMAGE_URL=${HEAT_CFN_IMAGE_URL:-"https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2"} 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" IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL"
;; ;;
*) *)
@ -577,7 +577,7 @@ fi
PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES) PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)
if [[ "$PRECACHE_IMAGES" == "True" ]]; then if [[ "$PRECACHE_IMAGES" == "True" ]]; then
# staging in update for nodepool # staging in update for nodepool
IMAGE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2" 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 if ! [[ "$IMAGE_URLS" =~ "$IMAGE_URL" ]]; then
IMAGE_URLS+=",$IMAGE_URL" IMAGE_URLS+=",$IMAGE_URL"
fi fi