openstack/devstack
Code Issues Proposed changes

Inject all account details in tempest.conf

Browse Source 
The tempest configuration function did not inject all account
details in tempest.conf. The only reason why it worked, was
because tempest uses default config values which are valid for
the current devstack setup.

To remove this dependency, two patches are needed:
- this one in devstack, to inject all values
- https://review.openstack.org/#/c/77602/ in tempest, to change
  default values to None

Partially fixes bug 1287191

Change-Id: I01507b142703a1ff66707464b9a743e9d0ca3e01
This commit is contained in:
Andrea Frittoli 2014-03-05 13:38:19 +00:00
parent 9db04f7f30
commit d46d9dd8de
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tempest
View File

@ -149,8 +149,12 @@ function configure_tempest {
password=${ADMIN_PASSWORD:-secrete}
# See files/keystone_data.sh where alt_demo user
# and tenant are set up...
# See files/keystone_data.sh and stack.sh where admin, demo and alt_demo
# user and tenant are set up...
ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-admin}
TEMPEST_USERNAME=${TEMPEST_USERNAME:-demo}
TEMPEST_TENANT_NAME=${TEMPEST_TENANT_NAME:-demo}
ALT_USERNAME=${ALT_USERNAME:-alt_demo}
ALT_TENANT_NAME=${ALT_TENANT_NAME:-alt_demo}
@ -254,11 +258,15 @@ function configure_tempest {
# Identity
iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"
iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v3/"
iniset $TEMPEST_CONFIG identity username $TEMPEST_USERNAME
iniset $TEMPEST_CONFIG identity password "$password"
iniset $TEMPEST_CONFIG identity tenant_name $TEMPEST_TENANT_NAME
iniset $TEMPEST_CONFIG identity alt_username $ALT_USERNAME
iniset $TEMPEST_CONFIG identity alt_password "$password"
iniset $TEMPEST_CONFIG identity alt_tenant_name $ALT_TENANT_NAME
iniset $TEMPEST_CONFIG identity admin_username $ADMIN_USERNAME
iniset $TEMPEST_CONFIG identity admin_password "$password"
iniset $TEMPEST_CONFIG identity admin_tenant_name $ADMIN_TENANT_NAME
# Image
# for the gate we want to be able to override this variable so we aren't
@ -285,7 +293,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
# Network
iniset $TEMPEST_CONFIG network api_version 2.0