openstack/devstack
Code Issues Proposed changes

Merge "Tempest allow_tenant_isolation in auth section"

Browse Source
This commit is contained in:
Jenkins 2014-12-12 17:14:36 +00:00 committed by Gerrit Code Review
commit bfed4850b7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -299,8 +299,10 @@ function configure_tempest {
iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
fi fi
# Auth
iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
# Compute # Compute
iniset $TEMPEST_CONFIG compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED
iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME
iniset $TEMPEST_CONFIG compute ip_version_for_ssh 4 iniset $TEMPEST_CONFIG compute ip_version_for_ssh 4