openstack/devstack
Code Issues Proposed changes

Merge "Switch to Fedora-x86_64-20-20140618-sda"

Browse Source
This commit is contained in:
Jenkins 2014-07-02 15:19:51 +00:00 committed by Gerrit Code Review
commit 86aa441253
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stackrc
View File

@ -360,7 +360,7 @@ esac
if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
case "$VIRT_DRIVER" in case "$VIRT_DRIVER" in
libvirt|baremetal|ironic) libvirt|baremetal|ironic)
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"} HEAT_CFN_IMAGE_URL=${HEAT_CFN_IMAGE_URL:-"http://dl.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"
;; ;;
*) *)
@ -385,7 +385,10 @@ 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_URLS+=",http://dl.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2" IMAGE_URL="http://dl.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 fi
# 10Gb default volume backing file size # 10Gb default volume backing file size