This breaks check-heat-dsvm-functional-mysql which assumes the previous glance image name.
This reverts commit 21dbe993348b794a1b77c4f9db0081d1cc32138c.
Change-Id: I77749f3f9f1a64719447ddd25ee95bc6d3afa5b3
| ... | ... |
@@ -552,7 +552,7 @@ esac |
| 552 | 552 |
if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then |
| 553 | 553 |
case "$VIRT_DRIVER" in |
| 554 | 554 |
libvirt|ironic) |
| 555 |
- 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"}
|
|
| 555 |
+ 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"}
|
|
| 556 | 556 |
IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL" |
| 557 | 557 |
;; |
| 558 | 558 |
*) |
| ... | ... |
@@ -577,7 +577,7 @@ fi |
| 577 | 577 |
PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES) |
| 578 | 578 |
if [[ "$PRECACHE_IMAGES" == "True" ]]; then |
| 579 | 579 |
# staging in update for nodepool |
| 580 |
- IMAGE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2" |
|
| 580 |
+ IMAGE_URL="https://download.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2" |
|
| 581 | 581 |
if ! [[ "$IMAGE_URLS" =~ "$IMAGE_URL" ]]; then |
| 582 | 582 |
IMAGE_URLS+=",$IMAGE_URL" |
| 583 | 583 |
fi |