@@ -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

@@ -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"

@@ -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

 # -----