openstack/devstack
Code Issues Proposed changes

Merge "Ensure flavor_ref_alt is different from flavor_ref"

Browse Source
This commit is contained in:
Jenkins 2013-06-14 16:15:06 +00:00 committed by Gerrit Code Review
commit f756470f0d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tempest
View File

@ -167,9 +167,15 @@ function configure_tempest() {
fi fi
flavor_ref=${flavors[0]} flavor_ref=${flavors[0]}
flavor_ref_alt=$flavor_ref flavor_ref_alt=$flavor_ref
if [[ $num_flavors -gt 1 ]]; then
flavor_ref_alt=${flavors[1]} # ensure flavor_ref and flavor_ref_alt have different values
fi # some resize instance in tempest tests depends on this.
for f in ${flavors[@]:1}; do
if [[ $f -ne $flavor_ref ]]; then
flavor_ref_alt=$f
break
fi
done
fi fi
if [ "$Q_USE_NAMESPACE" != "False" ]; then if [ "$Q_USE_NAMESPACE" != "False" ]; then