openstack/devstack
Code Issues Proposed changes

Merge "Move RABBIT_HOST to lib/rpc_backend"

Browse Source
This commit is contained in:
Jenkins 2017-01-10 19:45:10 +00:00 committed by Gerrit Code Review
commit 3bdeed0673
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/rpc_backend
View File

@ -25,6 +25,9 @@ _XTRACE_RPC_BACKEND=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
RABBIT_USERID=${RABBIT_USERID:-stackrabbit} RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
if is_service_enabled rabbit; then
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
fi
# Functions # Functions
# --------- # ---------

1
stack.sh
View File

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