Browse code
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 <treinish@linux.vnet.ibm.com>
Matthew Treinish authored on 2012/11/08 05:00:01Showing 1 changed files
| ... | ... |
@@ -47,6 +47,7 @@ if [ ! -e $TOP_DIR/openrc ]; then |
| 47 | 47 |
fi |
| 48 | 48 |
|
| 49 | 49 |
# Source params |
| 50 |
+source $TOP_DIR/lib/database |
|
| 50 | 51 |
source $TOP_DIR/openrc |
| 51 | 52 |
|
| 52 | 53 |
# Where Openstack code lives |
| ... | ... |
@@ -186,7 +187,7 @@ COMPUTE_CONFIG_PATH=/etc/nova/nova.conf |
| 186 | 186 |
# TODO(jaypipes): Create the key file here... right now, no whitebox |
| 187 | 187 |
# tests actually use a key. |
| 188 | 188 |
COMPUTE_PATH_TO_PRIVATE_KEY=$TEMPEST_DIR/id_rsa |
| 189 |
-COMPUTE_DB_URI=mysql://root:$MYSQL_PASSWORD@localhost/nova |
|
| 189 |
+COMPUTE_DB_URI=$BASE_SQL_CONN/nova |
|
| 190 | 190 |
|
| 191 | 191 |
# Image test configuration options... |
| 192 | 192 |
IMAGE_HOST=${IMAGE_HOST:-127.0.0.1}
|