openstack/devstack
Code Issues Proposed changes

Merge "Fix tempest flavors and DEFAULT_INSTANCE_TYPE"

Browse Source
This commit is contained in:
Jenkins 2013-01-10 22:53:24 +00:00 committed by Gerrit Code Review
commit 03a47842cc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tempest
View File

@ -134,12 +134,14 @@ function configure_tempest() {
flavor_lines=`nova flavor-list` flavor_lines=`nova flavor-list`
IFS=$'\r\n' IFS=$'\r\n'
flavors="" flavors=""
if [[ -n "$DEFAULT_INSTANCE_TYPE" ]]; then
for line in $flavor_lines; do for line in $flavor_lines; do
if [ -z $DEFAULT_INSTANCE_TYPE ]; then f=$(echo $line | awk "/ $DEFAULT_INSTANCE_TYPE / { print \$2 }")
flavors="$flavors `echo $line | grep -v "^\(|\s*ID\|+--\)" | cut -d' ' -f2`" flavors="$flavors $f"
else done
flavors="$flavors `echo $line | grep -v "^\(|\s*ID\|+--\)" | grep "$DEFAULT_INSTANCE_TYPE" | cut -d' ' -f2`"
fi fi
for line in $flavor_lines; do
flavors="$flavors `echo $line | grep -v "^\(|\s*ID\|+--\)" | cut -d' ' -f2`"
done done
IFS=" " IFS=" "