openstack
/
devstack
Code Issues Proposed changes

Remove the usage of read_password from library files 

The read_password function is defined inside stack.sh
and it cannot be used inside the "public library interface"
provided by DevStack.

Move the calls found inside library files to stack.sh,
following the same pattern of the other calls to read_password.

Change-Id: I8adc6723b677dfac2bef735f660e056c498bf773
This commit is contained in:
Luigi Toscano 2019-02-21 10:36:18 +01:00
parent 72f632222f
commit 29771c1c1e
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/database
View File

@ -87,8 +87,6 @@ function initialize_database_backends {
if [ -n "$MYSQL_PASSWORD" ]; then
DATABASE_PASSWORD=$MYSQL_PASSWORD
else
read_password DATABASE_PASSWORD "ENTER A PASSWORD TO USE FOR THE DATABASE."
fi
# We configure Nova, Horizon, Glance and Keystone to use MySQL as their

1
lib/nova_plugins/hypervisor-xenserver
View File

@ -59,7 +59,6 @@ function configure_nova_hypervisor {
die $LINENO "os-xenapi plugin is not specified. Please enable this plugin in local.conf"
fi
read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
iniset $NOVA_CONF DEFAULT compute_driver "xenapi.XenAPIDriver"
iniset $NOVA_CONF xenserver connection_url "$XENAPI_CONNECTION_URL"
iniset $NOVA_CONF xenserver connection_username "$XENAPI_USER"

19
stack.sh
View File

@ -691,7 +691,14 @@ function read_password {
# The available database backends are listed in ``DATABASE_BACKENDS`` after
# ``lib/database`` is sourced. ``mysql`` is the default.
initialize_database_backends && echo "Using $DATABASE_TYPE database backend" || echo "No database enabled"
if initialize_database_backends; then
echo "Using $DATABASE_TYPE database backend"
# 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."
else
echo "No database enabled"
fi
# Queue Configuration
@ -729,6 +736,16 @@ if is_service_enabled keystone; then
fi
# Nova
# -----
if is_service_enabled nova && [[ "$VIRT_DRIVER" == 'xenserver' ]]; then
# Look for the backend password here because read_password
# is not a library function.
read_password XENAPI_PASSWORD "ENTER A PASSWORD TO USE FOR XEN."
fi
# Swift
# -----