Fix rabbit_userid for multi node devstack
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:
parent
7f80280698
commit
f6287c2adb
4
stack.sh
4
stack.sh
@ -642,8 +642,10 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
|
|||||||
# Queue Configuration
|
# Queue Configuration
|
||||||
|
|
||||||
# Rabbit connection info
|
# 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
|
if is_service_enabled rabbit; then
|
||||||
RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
|
|
||||||
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."
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user