The changes from https://review.openstack.org/#/c/23364/ simplified
the usage of database_connection_url_mysql and
database_connection_url_postgresql without making the proper changes
to database_connection_url.
Fixes: bug #1167668
Signed-off-by: Tal Kain <tal.kain@ravellosystems.com>
Change-Id: I5115d123ad794f2eb2e144b76932031af5248f26
| ... | ... |
@@ -38,7 +38,7 @@ done |
| 38 | 38 |
for db in $DATABASE_BACKENDS; do |
| 39 | 39 |
# Set the type for the rest of the backend to use |
| 40 | 40 |
if is_service_enabled $db; then |
| 41 |
- # Set this now for the rest of the database funtions |
|
| 41 |
+ # Set this now for the rest of the database functions |
|
| 42 | 42 |
DATABASE_TYPE=$db |
| 43 | 43 |
fi |
| 44 | 44 |
done |
| ... | ... |
@@ -110,13 +110,11 @@ function configure_database {
|
| 110 | 110 |
configure_database_$DATABASE_TYPE |
| 111 | 111 |
} |
| 112 | 112 |
|
| 113 |
-# Generate an SQLAlchemy connection URL and store it in a variable |
|
| 114 |
-# $1 The variable name in which to store the connection URL |
|
| 115 |
-# $2 The name of the database |
|
| 113 |
+# Generate an SQLAlchemy connection URL and output it using echo |
|
| 114 |
+# $1 The name of the database |
|
| 116 | 115 |
function database_connection_url {
|
| 117 |
- local var=$1 |
|
| 118 |
- local db=$2 |
|
| 119 |
- database_connection_url_$DATABASE_TYPE $var $db |
|
| 116 |
+ local db=$1 |
|
| 117 |
+ database_connection_url_$DATABASE_TYPE $db |
|
| 120 | 118 |
} |
| 121 | 119 |
|
| 122 | 120 |
|