Merge "make compute-admin correct"

This commit is contained in:
Jenkins
2014-03-08 01:46:55 +00:00
committed by Gerrit Code Review

View File

@@ -294,9 +294,9 @@ function configure_tempest {
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
# Compute admin
iniset $TEMPEST_CONFIG "compute-admin" username $USERNAME
iniset $TEMPEST_CONFIG "compute-admin" password "$password" # DEPRECATED
iniset $TEMPEST_CONFIG "compute-admin" tenant_name $TENANT_NAME
iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME
iniset $TEMPEST_CONFIG "compute-admin" password "$password"
iniset $TEMPEST_CONFIG "compute-admin" tenant_name $ADMIN_TENANT_NAME
# Network
iniset $TEMPEST_CONFIG network api_version 2.0