commit 2700492c349c32a4e3a93a327231256c8db50ec5
author Devananda van der Veen <devananda.vdv@gmail.com> Wed Aug 15 16:38:29 2012 -0700
committer Devananda van der Veen <devananda.vdv@gmail.com> Wed Aug 15 16:40:23 2012 -0700
tree 2772ed3b11f2f3fa0e983579df56c4b3499bd7b8
parent 75e0354a3be623c157e4ac12aac9463c4d804cfc

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

tools/configure_tempest.sh

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 5be709a..d502248 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -139,9 +139,9 @@
 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=" "