Merge "Enable image deactivate feature which was added in kilo"

This commit is contained in:
Jenkins 2015-06-09 22:30:32 +00:00 committed by Gerrit Code Review
commit 4c746084e2
1 changed files with 3 additions and 0 deletions

View File

@ -330,6 +330,9 @@ function configure_tempest {
iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
fi
# Image Features
iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True
# Auth
TEMPEST_ALLOW_TENANT_ISOLATION=${TEMPEST_ALLOW_TENANT_ISOLATION:-$TEMPEST_HAS_ADMIN}
iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}