openstack/devstack
Code Issues Proposed changes

Merge "Cut the heat flavor"

Browse Source
This commit is contained in:
Jenkins 2014-06-17 08:17:51 +00:00 committed by Gerrit Code Review
commit b15413c252
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -316,10 +316,10 @@ function configure_tempest {
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
iniset $TEMPEST_CONFIG orchestration image_ref $(basename "$HEAT_CFN_IMAGE_URL" ".qcow2")
fi
# build a specialized heat flavor that is likely to be fast
# build a specialized heat flavor
available_flavors=$(nova flavor-list)
if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
nova flavor-create m1.heat 451 1024 0 2
nova flavor-create m1.heat 451 512 0 1
fi
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
iniset $TEMPEST_CONFIG orchestration build_timeout 900