openstack/devstack
Code Issues Proposed changes

Merge "Disable nova calls from tempest when heat is enabled"

Browse Source
This commit is contained in:
Jenkins 2016-03-07 14:30:21 +00:00 committed by Gerrit Code Review
commit e15b07265d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tempest
View File

@ -414,12 +414,15 @@ function configure_tempest {
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}") iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")
fi fi
# Nova might not be enabled, especially when we want to test tempest scenario/API that only create Neutron resources
if is_service_enabled nova; then
# build a specialized heat flavor # build a specialized heat flavor
available_flavors=$(nova flavor-list) available_flavors=$(nova flavor-list)
if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
nova flavor-create m1.heat 451 512 0 1 nova flavor-create m1.heat 451 512 0 1
fi fi
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat" iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
fi
iniset $TEMPEST_CONFIG orchestration build_timeout 900 iniset $TEMPEST_CONFIG orchestration build_timeout 900
iniset $TEMPEST_CONFIG orchestration stack_owner_role "_member_" iniset $TEMPEST_CONFIG orchestration stack_owner_role "_member_"
fi fi