Fix tools/configure_tempest FLAVOR_LIST

Correct the grep expression in tools/configure_tempest.sh
which generates the FLAVORS that tempest will boot.

Fixes bug 1037347

Change-Id: I50352fd23ca1e5332592bb343821c6355b274e9f
This commit is contained in:
Devananda van der Veen 2012-08-15 16:38:29 -07:00
parent 75e0354a3b
commit 2700492c34

View File

@ -139,9 +139,9 @@ IFS="$(echo -e "\n\r")"
FLAVORS=""
for line in $FLAVOR_LINES; do
if [ -z $DEFAULT_INSTANCE_TYPE ]; then
FLAVORS="$FLAVORS `echo $line | grep -v "^\(ID\|+--\)" | cut -d' ' -f2`"
FLAVORS="$FLAVORS `echo $line | grep -v "^\(|\s*ID\|+--\)" | cut -d' ' -f2`"
else
FLAVORS="$FLAVORS `echo $line | grep -v "^\(ID\|+--\)" | grep "$DEFAULT_INSTANCE_TYPE" | cut -d' ' -f2`"
FLAVORS="$FLAVORS `echo $line | grep -v "^\(|\s*ID\|+--\)" | grep "$DEFAULT_INSTANCE_TYPE" | cut -d' ' -f2`"
fi
done
IFS=" "