openstack/devstack
Code Issues Proposed changes

Merge "Revert "Exit after printing error about RPC config""

Browse Source
This commit is contained in:
Jenkins 2015-01-29 22:56:32 +00:00 committed by Gerrit Code Review
commit b9a7d3b5e4
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