From 2700492c349c32a4e3a93a327231256c8db50ec5 Mon Sep 17 00:00:00 2001
From: Devananda van der Veen <devananda.vdv@gmail.com>
Date: Wed, 15 Aug 2012 16:38:29 -0700
Subject: [PATCH] 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index 5be709aa51..d50224875e 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -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=" "