1. devstack
  2. Commit 0bf25506b03c78dd809e3638cabcf1fc11e9f1a0
Browse code

Move RABBIT_USERID to lib/rpc_backend

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

melanie witt authored on 2016/08/31 07:14:04
Showing 2 changed files
lib/rpc_backend
History View file @ 0bf2550
... ... 
@@ -24,6 +24,8 @@
24 24 
 _XTRACE_RPC_BACKEND=$(set +o | grep xtrace)
25 25 
 set +o xtrace
26 26
27 
+RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
28 
+
27 29 
 # Functions
28 30 
 # ---------
29 31
stack.sh
History View file @ 0bf2550
... ... 
@@ -664,7 +664,6 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
664 664 
 # Rabbit connection info
665 665 
 # In multi node DevStack, second node needs ``RABBIT_USERID``, but rabbit
666 666 
 # isn't enabled.
667 
-RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
668 667 
 if is_service_enabled rabbit; then
669 668 
     RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
670 669 
     read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."