Browse code

Merge "Update used Fedora images to version 21"

Jenkins authored on 2014/12/12 00:28:45
Showing 1 changed files
... ...
@@ -570,7 +570,7 @@ esac
570 570
 if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
571 571
     case "$VIRT_DRIVER" in
572 572
         libvirt|ironic)
573
-            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"}
573
+            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"}
574 574
             IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL"
575 575
             ;;
576 576
         *)
... ...
@@ -595,7 +595,7 @@ fi
595 595
 PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)
596 596
 if [[ "$PRECACHE_IMAGES" == "True" ]]; then
597 597
     # staging in update for nodepool
598
-    IMAGE_URL="https://download.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2"
598
+    IMAGE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.qcow2"
599 599
     if ! [[ "$IMAGE_URLS"  =~ "$IMAGE_URL" ]]; then
600 600
         IMAGE_URLS+=",$IMAGE_URL"
601 601
     fi