openstack/devstack
Code Issues Proposed changes

Disable nova calls from tempest when heat is enabled

Browse Source 
This patch ensures that lib/tempest doesn't call nova when heat is
enabled and nova is disabled.

Change-Id: I2debbae1bb82ecace1058e99ab172272393fb5ea
Closes-bug: #1549708
This commit is contained in:
Mathieu Rohon 2016-02-25 10:00:36 +00:00
parent b01a3c3baf
commit 0c985c8627
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tempest
View File

@ -412,12 +412,15 @@ function configure_tempest {
if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then
iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")
fi
# build a specialized heat flavor
available_flavors=$(nova flavor-list)
if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
nova flavor-create m1.heat 451 512 0 1
# 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
available_flavors=$(nova flavor-list)
if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
nova flavor-create m1.heat 451 512 0 1
fi
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
fi
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
iniset $TEMPEST_CONFIG orchestration build_timeout 900
iniset $TEMPEST_CONFIG orchestration stack_owner_role "_member_"
fi