From d8267b74aeb865ac1289d75bd2a965d3248aeed5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 29 Jan 2015 09:25:42 -0800 Subject: [PATCH] Revert "Exit after printing error about RPC config" This reverts commit c1dbf10562796c7006fd0a66c6cb39a1b990c8c1. 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 --- lib/rpc_backend | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/rpc_backend b/lib/rpc_backend index 98be1844b6..d87d6207b1 100644 --- a/lib/rpc_backend +++ b/lib/rpc_backend @@ -54,15 +54,13 @@ function check_rpc_backend { (( rpc_backend_cnt++ )) || true done if [ "$rpc_backend_cnt" -gt 1 ]; then - die $LINENO \ - "Only one rpc backend may be enabled, " \ - "set only one of 'rabbit', 'qpid', 'zeromq' " \ - "via ENABLED_SERVICES." + echo "ERROR: only one rpc backend may be enabled," + echo " set only one of 'rabbit', 'qpid', 'zeromq'" + echo " via ENABLED_SERVICES." elif [ "$rpc_backend_cnt" == 0 ] && [ "$rpc_needed" == 0 ]; then - die $LINENO \ - "at least one rpc backend must be enabled, " \ - "set one of 'rabbit', 'qpid', 'zeromq'" \ - "via ENABLED_SERVICES." + echo "ERROR: at least one rpc backend must be enabled," + echo " set one of 'rabbit', 'qpid', 'zeromq'" + echo " via ENABLED_SERVICES." fi if is_service_enabled qpid && ! qpid_is_supported; then