Merge "Revert "Update used Fedora images to version 21""
This commit is contained in:
commit
f344758fb4
4
stackrc
4
stackrc
@ -570,7 +570,7 @@ esac
|
||||
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/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"
|
||||
;;
|
||||
*)
|
||||
@ -595,7 +595,7 @@ fi
|
||||
PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)
|
||||
if [[ "$PRECACHE_IMAGES" == "True" ]]; then
|
||||
# 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
|
||||
IMAGE_URLS+=",$IMAGE_URL"
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user