commit b9a7d3b5e4f01d932709633f2b5b9461ecdbd0cb
author Jenkins <jenkins@review.openstack.org> Thu Jan 29 22:56:32 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jan 29 22:56:32 2015 +0000
tree 0f2c3cce87f4eb04d6862eb6c8ef5dca84573c5c
parent d84d93d8ae343faca68505b5918c7866cb092318
parent d8267b74aeb865ac1289d75bd2a965d3248aeed5

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

lib/rpc_backend

diff --git a/lib/rpc_backend b/lib/rpc_backend
index 98be184..d87d620 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -54,15 +54,13 @@
         (( 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