image_list.sh is used to make a list of all possible images. Loop over
both x86_64 and i386 instead of just using the default arch of x86_64
For live migration we are starting to use the i386 arch based images and
don't want to cache them like all other images.
Change-Id: I47da72a0e9da3689cb085bb43ac6536094445112
... | ... |
@@ -9,6 +9,8 @@ source $TOP_DIR/functions |
9 | 9 |
# dummy in the end position to trigger the fall through case. |
10 | 10 |
DRIVERS="openvz ironic libvirt vsphere xenserver dummy" |
11 | 11 |
|
12 |
+CIRROS_ARCHS="x86_64 i386" |
|
13 |
+ |
|
12 | 14 |
# Extra variables to trigger getting additional images. |
13 | 15 |
export ENABLED_SERVICES="h-api,tr-api" |
14 | 16 |
HEAT_FETCHED_TEST_IMAGE="Fedora-i386-20-20131211.1-sda" |
... | ... |
@@ -17,12 +19,15 @@ PRECACHE_IMAGES=True |
17 | 17 |
# Loop over all the virt drivers and collect all the possible images |
18 | 18 |
ALL_IMAGES="" |
19 | 19 |
for driver in $DRIVERS; do |
20 |
- VIRT_DRIVER=$driver |
|
21 |
- URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS) |
|
22 |
- if [[ ! -z "$ALL_IMAGES" ]]; then |
|
23 |
- ALL_IMAGES+=, |
|
24 |
- fi |
|
25 |
- ALL_IMAGES+=$URLS |
|
20 |
+ for arch in $CIRROS_ARCHS; do |
|
21 |
+ CIRROS_ARCH=$arch |
|
22 |
+ VIRT_DRIVER=$driver |
|
23 |
+ URLS=$(source $TOP_DIR/stackrc && echo $IMAGE_URLS) |
|
24 |
+ if [[ ! -z "$ALL_IMAGES" ]]; then |
|
25 |
+ ALL_IMAGES+=, |
|
26 |
+ fi |
|
27 |
+ ALL_IMAGES+=$URLS |
|
28 |
+ done |
|
26 | 29 |
done |
27 | 30 |
|
28 | 31 |
# Make a nice list |