openstack/devstack
Code Issues Proposed changes

Revert "Exit after printing error about RPC config"

Browse Source 
This reverts commit c1dbf10562.

Reverting because it is valid to run devstack without enabling an rpc
backend. For example when you run devstack on a multinode deployment
compute hosts probably shouldn't run rabbit and instead will just talk
to the rabbit server set up on the controller node. As a result we
should not die when no rpc backends are set.

Change-Id: If9a31e031552f4161d42094fa960221b4d9e893c
This commit is contained in:
Clark Boylan 2015-01-29 09:25:42 -08:00
parent e605b39400
commit d8267b74ae
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rpc_backend
View File

@ -54,15 +54,13 @@ function check_rpc_backend {
(( rpc_backend_cnt++ )) || true (( rpc_backend_cnt++ )) || true
done done
if [ "$rpc_backend_cnt" -gt 1 ]; then if [ "$rpc_backend_cnt" -gt 1 ]; then
die $LINENO \ echo "ERROR: only one rpc backend may be enabled,"
"Only one rpc backend may be enabled, " \ echo " set only one of 'rabbit', 'qpid', 'zeromq'"
"set only one of 'rabbit', 'qpid', 'zeromq' " \ echo " via ENABLED_SERVICES."
"via ENABLED_SERVICES."
elif [ "$rpc_backend_cnt" == 0 ] && [ "$rpc_needed" == 0 ]; then elif [ "$rpc_backend_cnt" == 0 ] && [ "$rpc_needed" == 0 ]; then
die $LINENO \ echo "ERROR: at least one rpc backend must be enabled,"
"at least one rpc backend must be enabled, " \ echo " set one of 'rabbit', 'qpid', 'zeromq'"
"set one of 'rabbit', 'qpid', 'zeromq'" \ echo " via ENABLED_SERVICES."
"via ENABLED_SERVICES."
fi fi
if is_service_enabled qpid && ! qpid_is_supported; then if is_service_enabled qpid && ! qpid_is_supported; then