commit 86aa4412531cebba067585adf993ecce975a9e2f
author Jenkins <jenkins@review.openstack.org> Wed Jul 02 15:19:51 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 02 15:19:51 2014 +0000
tree 66d55f249e6f98004fa9e87c8f88f854e60c9f37
parent 134609f9a6e8aae8022eb41da7fd2a48238fe720
parent bfcb2ff732ffdf2ed50be6a677f1b6182a0213a4

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

stackrc

diff --git a/stackrc b/stackrc
index 313fdd2..3923d38 100644
--- a/stackrc
+++ b/stackrc
@@ -360,7 +360,7 @@
 if [[ "$ENABLED_SERVICES" =~ 'h-api' ]]; then
     case "$VIRT_DRIVER" in
         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"
             ;;
         *)
@@ -385,7 +385,10 @@
 PRECACHE_IMAGES=$(trueorfalse False $PRECACHE_IMAGES)
 if [[ "$PRECACHE_IMAGES" == "True" ]]; then
     # 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
 
 # 10Gb default volume backing file size