openstack/devstack
Code Issues Proposed changes

Add multiple database support to configure_tempest

Browse Source 
After support for multiple databases were added to devstack,
configure tempest would not work with update_database() in
localrc.

This sources lib/database before localrc is loaded so that
update_database is defined. Also, COMPUTE_DB_URI is now
replaced by BASE_SQL_CONN from lib/database.

Change-Id: Ifd791e5732898a661cc1237839bd18cef2f36f60
Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
This commit is contained in:
Matthew Treinish 2012-11-07 15:00:01 -05:00
parent 8ec719b4d4
commit 5233064713
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/configure_tempest.sh
View File

@ -47,6 +47,7 @@ if [ ! -e $TOP_DIR/openrc ]; then
fi
# Source params
source $TOP_DIR/lib/database
source $TOP_DIR/openrc
# Where Openstack code lives
@ -186,7 +187,7 @@ COMPUTE_CONFIG_PATH=/etc/nova/nova.conf
# TODO(jaypipes): Create the key file here... right now, no whitebox
# tests actually use a key.
COMPUTE_PATH_TO_PRIVATE_KEY=$TEMPEST_DIR/id_rsa
COMPUTE_DB_URI=mysql://root:$MYSQL_PASSWORD@localhost/nova
COMPUTE_DB_URI=$BASE_SQL_CONN/nova
# Image test configuration options...
IMAGE_HOST=${IMAGE_HOST:-127.0.0.1}