From 5233064713b94ca56137bbcee6f8d5c2cbbd48e3 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 7 Nov 2012 15:00:01 -0500 Subject: [PATCH] Add multiple database support to configure_tempest 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 --- tools/configure_tempest.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh index 1e35036b19..070bc0bd9a 100755 --- a/tools/configure_tempest.sh +++ b/tools/configure_tempest.sh @@ -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}