Skip to content

Commit 20eb274

Browse files
committed
Move RABBIT_HOST to lib/rpc_backend
This moves setting of RABBIT_HOST 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_HOST is needed in order to call get_transport_url in lib/rpc_backend. Change-Id: I504f7fac7bb9a8c158e20046dbd1dd2d507db02b Closes-Bug: #1649586 Depends-On: I3d4d7b309e50f4e2970cda55aada02d68c4fa705
1 parent 51a225c commit 20eb274

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

lib/rpc_backend

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ _XTRACE_RPC_BACKEND=$(set +o | grep xtrace)
2525
set +o xtrace
2626

2727
RABBIT_USERID=${RABBIT_USERID:-stackrabbit}
28+
if is_service_enabled rabbit; then
29+
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
30+
fi
2831

2932
# Functions
3033
# ---------

stack.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,6 @@ initialize_database_backends && echo "Using $DATABASE_TYPE database backend" ||
664664
# In multi node DevStack, second node needs ``RABBIT_USERID``, but rabbit
665665
# isn't enabled.
666666
if is_service_enabled rabbit; then
667-
RABBIT_HOST=${RABBIT_HOST:-$SERVICE_HOST}
668667
read_password RABBIT_PASSWORD "ENTER A PASSWORD TO USE FOR RABBIT."
669668
fi
670669

0 commit comments

Comments
 (0)