openstack/devstack
Code Issues Proposed changes

Fix rabbit_userid for multi node devstack

Browse Source 
I43a231c9611b4cc2e390b603aa3bfb49c915bdc5 introduced a new setting
RABBIT_USERID but only set it if rabbit is enabled. In multi node
devstack the second node uses RABBIT_USERID but the service rabbit isn't
enabled on it.

Always set RABBIT_USERID, if a different message queue is used the
variable will just be ignored.

Change-Id: I8568bddda2a5c66235ecae23af58983ee94c720a
This commit is contained in:
Joe Gordon 2014-12-16 13:32:41 -08:00
parent 7f80280698
commit f6287c2adb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -642,8 +642,10 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
# Queue Configuration
# 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_USERID=${RABBIT_USERID:-stackrabbit}
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
fi