openstack/devstack
Code Issues Proposed changes

Merge "Tempest should create his own flavors"

Browse Source
This commit is contained in:
Jenkins 2013-01-14 13:57:43 +00:00 committed by Gerrit Code Review
commit 5219f78d20
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tempest
View File

@ -129,17 +129,24 @@ function configure_tempest() {
ALT_USERNAME=${ALT_USERNAME:-alt_demo} ALT_USERNAME=${ALT_USERNAME:-alt_demo}
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo} ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
# If the ``DEFAULT_INSTANCE_TYPE`` not declared, use the new behavior
# Tempest creates instane types for himself
if [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then
nova flavor-create m1.pico 42 32 0 1
flavor_ref=42
nova flavor-create m1.nano 84 64 0 1
flavor_ref_alt=84
else
# Check Nova for existing flavors and, if set, look for the # Check Nova for existing flavors and, if set, look for the
# ``DEFAULT_INSTANCE_TYPE`` and use that. Otherwise, just use the first flavor. # ``DEFAULT_INSTANCE_TYPE`` and use that.
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
f=$(echo $line | awk "/ $DEFAULT_INSTANCE_TYPE / { print \$2 }") f=$(echo $line | awk "/ $DEFAULT_INSTANCE_TYPE / { print \$2 }")
flavors="$flavors $f" flavors="$flavors $f"
done done
fi
for line in $flavor_lines; do for line in $flavor_lines; do
flavors="$flavors `echo $line | grep -v "^\(|\s*ID\|+--\)" | cut -d' ' -f2`" flavors="$flavors `echo $line | grep -v "^\(|\s*ID\|+--\)" | cut -d' ' -f2`"
done done
@ -157,6 +164,7 @@ function configure_tempest() {
if [[ $num_flavors -gt 1 ]]; then if [[ $num_flavors -gt 1 ]]; then
flavor_ref_alt=${flavors[1]} flavor_ref_alt=${flavors[1]}
fi fi
fi
if [ "$Q_USE_NAMESPACE" != "False" ]; then if [ "$Q_USE_NAMESPACE" != "False" ]; then
tenant_networks_reachable=false tenant_networks_reachable=false