openstack/devstack
Code Issues Proposed changes

Merge "Add heat_stack_owner role required by tempest"

Browse Source
This commit is contained in:
Jenkins 2016-04-20 06:21:24 +00:00 committed by Gerrit Code Review
commit 3e4c25b6c2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tempest
View File

@ -383,6 +383,11 @@ function configure_tempest {
# Orchestration Tests # Orchestration Tests
if is_service_enabled heat; then if is_service_enabled heat; then
# Though this is not needed by heat, some tempest tests explicitly
# try to set this role. Removing them from the tempest tests breaks
# some non-devstack CIs.
get_or_create_role "heat_stack_owner"
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
@ -396,7 +401,7 @@ function configure_tempest {
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat" iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
fi 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 "heat_stack_owner"
fi fi
# Scenario # Scenario