openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-02-26 18:19:37 +00:00 committed by Gerrit Code Review
commit 3ffd5475bf
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/image_list.sh
View File

@ -9,6 +9,8 @@ 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"
@ -17,12 +19,15 @@ 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
VIRT_DRIVER=$driver for arch in $CIRROS_ARCHS; do
URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS) CIRROS_ARCH=$arch
if [[ ! -z "$ALL_IMAGES" ]]; then VIRT_DRIVER=$driver
ALL_IMAGES+=, URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS)
fi if [[ ! -z "$ALL_IMAGES" ]]; then
ALL_IMAGES+=$URLS ALL_IMAGES+=,
fi
ALL_IMAGES+=$URLS
done
done done
# Make a nice list # Make a nice list