openstack/devstack
Code Issues Proposed changes

Merge "Remove the heat stack owner role"

Browse Source
This commit is contained in:
Jenkins
2016-11-30 16:31:11 +00:00
committed by Gerrit Code Review
parent b719b55b1d cac6ef09c5
commit 36ea69272d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tempest
View File

@@ -383,11 +383,6 @@ function configure_tempest {
# Orchestration Tests
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
iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")
fi
@@ -401,7 +396,7 @@ function configure_tempest {
iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
fi
iniset $TEMPEST_CONFIG orchestration build_timeout 900
iniset $TEMPEST_CONFIG orchestration stack_owner_role "heat_stack_owner"
iniset $TEMPEST_CONFIG orchestration stack_owner_role Member
fi
# Scenario