From 0f5da0016881578b3b822f4e8500095fefa08b83 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 3 May 2012 11:52:55 -0400 Subject: [PATCH] Regenerate tempest.conf every time Select for active images If we don't do this, repeat devstack installs won't be able to use this script. Change-Id: I95746ffebfa7163c80161d26de1e575c0fc5d39c --- tools/configure_tempest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index bed3d6709e..a84c42b592 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -67,11 +67,12 @@ fi # We ignore ramdisk and kernel images and set the IMAGE_UUID to # the first image returned and set IMAGE_UUID_ALT to the second, # if there is more than one returned... +# ... Also ensure we only take active images, so we don't get snapshots in process IMAGE_LINES=`glance image-list` IFS="$(echo -e "\n\r")" IMAGES="" for line in $IMAGE_LINES; do - IMAGES="$IMAGES `echo $line | grep -v "^\(ID\|+--\)" | grep -v "\(aki\|ari\)" | cut -d' ' -f2`" + IMAGES="$IMAGES `echo $line | grep -v "^\(ID\|+--\)" | grep -v "\(aki\|ari\)" | grep 'active' | cut -d' ' -f2`" done # Create array of image UUIDs... IFS=" " @@ -89,9 +90,8 @@ if [[ $NUM_IMAGES -gt 1 ]]; then fi # Create tempest.conf from tempest.conf.tpl -if [[ ! -r $TEMPEST_CONF ]]; then - cp $TEMPEST_CONF.tpl $TEMPEST_CONF -fi +# copy every time, because the image UUIDS are going to change +cp $TEMPEST_CONF.tpl $TEMPEST_CONF IDENTITY_USE_SSL=${IDENTITY_USE_SSL:-False} IDENTITY_HOST=${IDENTITY_HOST:-127.0.0.1}