Browse code
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
Joe Gordon authored on 2014/12/17 06:32:41Showing 1 changed files
| ... | ... |
@@ -642,8 +642,10 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" || |
| 642 | 642 |
# Queue Configuration |
| 643 | 643 |
|
| 644 | 644 |
# Rabbit connection info |
| 645 |
+# In multi node devstack, second node needs RABBIT_USERID, but rabbit |
|
| 646 |
+# isn't enabled. |
|
| 647 |
+RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
|
|
| 645 | 648 |
if is_service_enabled rabbit; then |
| 646 |
- RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
|
|
| 647 | 649 |
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
|
| 648 | 650 |
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT." |
| 649 | 651 |
fi |