1. devstack
  2. Commit 747ced56823986a59e00d83b517760bf784e772f
Browse code

Merge "Add check for RABBIT_HOST and RABBIT_PASSWORD in iniset_rpc_backend"

Jenkins authored on 2013/01/30 10:27:26
Showing 1 changed files
lib/rpc_backend
History View file @ 747ced5
... ... 
@@ -100,7 +100,7 @@ function iniset_rpc_backend() {
100 100 
         iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_zmq
101 101 
     elif is_service_enabled qpid; then
102 102 
         iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_qpid
103 
-    elif is_service_enabled rabbit; then
103 
+    elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
104 104 
         iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_kombu
105 105 
         iniset $file $section rabbit_host $RABBIT_HOST
106 106 
         iniset $file $section rabbit_password $RABBIT_PASSWORD