diff --git a/lib/rpc_backend b/lib/rpc_backend index 4d7f8d2f1d..f35f9dbd57 100644 --- a/lib/rpc_backend +++ b/lib/rpc_backend @@ -100,7 +100,7 @@ function iniset_rpc_backend() { iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_zmq elif is_service_enabled qpid; then iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_qpid - elif is_service_enabled rabbit; then + elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_kombu iniset $file $section rabbit_host $RABBIT_HOST iniset $file $section rabbit_password $RABBIT_PASSWORD