Fix stacking without preconfigured DATABASE_PASSWORD
When we need to read a DATABASE_PASSWORD from the user, make sure we actually use it in our database URLs. Signed-off-by: Dr. Jens Harbott <harbott@osism.tech> Change-Id: I5ebf6b0280e82f2c87a63cbee7a9957c6bd26898
This commit is contained in:
parent
24b65adc9c
commit
353c3f9cb1
@ -89,6 +89,10 @@ function initialize_database_backends {
|
||||
DATABASE_PASSWORD=$MYSQL_PASSWORD
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
function define_database_baseurl {
|
||||
# We configure Nova, Horizon, Glance and Keystone to use MySQL as their
|
||||
# database server. While they share a single server, each has their own
|
||||
# database and tables.
|
||||
@ -100,8 +104,6 @@ function initialize_database_backends {
|
||||
|
||||
# NOTE: Don't specify ``/db`` in this string so we can use it for multiple services
|
||||
BASE_SQL_CONN=${BASE_SQL_CONN:-$(get_database_type_$DATABASE_TYPE)://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
# Recreate a given database
|
||||
|
2
stack.sh
2
stack.sh
@ -691,6 +691,8 @@ if initialize_database_backends; then
|
||||
# Last chance for the database password. This must be handled here
|
||||
# because read_password is not a library function.
|
||||
read_password DATABASE_PASSWORD "ENTER A PASSWORD TO USE FOR THE DATABASE."
|
||||
|
||||
define_database_baseurl
|
||||
else
|
||||
echo "No database enabled"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user