Merge "Move RABBIT_USERID to lib/rpc_backend"

This commit is contained in:
Jenkins 2016-08-31 21:22:48 +00:00 committed by Gerrit Code Review
commit fb1e1cc7e3
2 changed files with 2 additions and 1 deletions

View File

@ -24,6 +24,8 @@
_XTRACE_RPC_BACKEND=$(set +o | grep xtrace)
set +o xtrace
RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
# Functions
# ---------

View File

@ -664,7 +664,6 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
# Rabbit connection info
# In multi node DevStack, second node needs ``RABBIT_USERID``, but rabbit
# isn't enabled.
RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
if is_service_enabled rabbit; then
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."