openstack/devstack
Code Issues Proposed changes

Revert "List all CIRROS ARCH images in image_list.sh"

Browse Source 
This reverts commit 71e82f52bde99b4bf791ea1558f1abf86019a384.

aioppcu now uses x86_64 so no need to list the i386 images for caching.

Change-Id: If500367c8bf3fdb4590c866e007ecd7de1ab5781
Depends-On: I839e1c724821ba2624beddb5233eda24b50c149f
This commit is contained in:
Joe Gordon 2015-04-06 10:25:54 -07:00
parent 43479db910
commit 33ba738b05
1 changed files with 6 additions and 11 deletions

17
tools/image_list.sh

@ -9,8 +9,6 @@ source $TOP_DIR/functions
# dummy in the end position to trigger the fall through case. # dummy in the end position to trigger the fall through case.
DRIVERS="openvz ironic libvirt vsphere xenserver dummy" DRIVERS="openvz ironic libvirt vsphere xenserver dummy"
CIRROS_ARCHS="x86_64 i386"
# Extra variables to trigger getting additional images. # Extra variables to trigger getting additional images.
export ENABLED_SERVICES="h-api,tr-api" export ENABLED_SERVICES="h-api,tr-api"
HEAT_FETCHED_TEST_IMAGE="Fedora-i386-20-20131211.1-sda" HEAT_FETCHED_TEST_IMAGE="Fedora-i386-20-20131211.1-sda"
@ -19,15 +17,12 @@ PRECACHE_IMAGES=True
# Loop over all the virt drivers and collect all the possible images # Loop over all the virt drivers and collect all the possible images
ALL_IMAGES="" ALL_IMAGES=""
for driver in $DRIVERS; do for driver in $DRIVERS; do
for arch in $CIRROS_ARCHS; do VIRT_DRIVER=$driver
CIRROS_ARCH=$arch URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS)
VIRT_DRIVER=$driver if [[ ! -z "$ALL_IMAGES" ]]; then
URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS) ALL_IMAGES+=,
if [[ ! -z "$ALL_IMAGES" ]]; then fi
ALL_IMAGES+=, ALL_IMAGES+=$URLS
fi
ALL_IMAGES+=$URLS
done
done done
# Make a nice list # Make a nice list