Browse code

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

Jenkins authored on 2014/07/03 00:19:51
Showing 1 changed files
... ...
@@ -360,7 +360,7 @@ esac
360 360
 if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
361 361
     case "$VIRT_DRIVER" in
362 362
         libvirt|baremetal|ironic)
363
-            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"}
363
+            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"}
364 364
             IMAGE_URLS+=",$HEAT_CFN_IMAGE_URL"
365 365
             ;;
366 366
         *)
... ...
@@ -385,7 +385,10 @@ fi
385 385
 PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)
386 386
 if [[ "$PRECACHE_IMAGES" == "True" ]]; then
387 387
     # staging in update for nodepool
388
-    IMAGE_URLS+=",http://dl.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2"
388
+    IMAGE_URL="http://dl.fedoraproject.org/pub/alt/openstack/20/x86_64/Fedora-x86_64-20-20140618-sda.qcow2"
389
+    if ! [[ "$IMAGE_URLS"  =~ "$IMAGE_URL" ]]; then
390
+        IMAGE_URLS+=",$IMAGE_URL"
391
+    fi
389 392
 fi
390 393
 
391 394
 # 10Gb default volume backing file size