openstack/devstack
Code Issues Proposed changes

Move RABBIT_USERID to lib/rpc_backend

Browse Source 
This moves setting of RABBIT_USERID from stack.sh to lib/rpc_backend
so it may be used in grenade runs, which don't have the defaulted
value from stack.sh. The RABBIT_USERID is needed in order to call
get_transport_url in lib/rpc_backend.

Change-Id: I6f211e9102f79418f9f94a15784f91c4150ab8a7
This commit is contained in:
melanie witt 2016-08-30 22:14:04 +00:00
parent 79722563a6
commit 0bf25506b0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rpc_backend
View File

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

1
stack.sh
View File

@ -664,7 +664,6 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
# Rabbit connection info # Rabbit connection info
# 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.
RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
if is_service_enabled rabbit; then if is_service_enabled rabbit; then
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST} 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."