commit c5d738da6c2a47f5d9a2b4bee02b05044d85c15c
author Jenkins <jenkins@review.openstack.org> Wed Jul 10 18:49:20 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 10 18:49:20 2013 +0000
tree 240d97c7cf991083c5ef710fa56515982d8fb3cb
parent cf6d809d8d13b8177826b9c95b0ccab6f0dcb9c4
parent 056df827ff3f8d40eeeedea3d09daae86982e5b5

Merge "Set QPID_HOST parameter to better support multi-node mode"

lib/rpc_backend

diff --git a/lib/rpc_backend b/lib/rpc_backend
index 4b04053..462e6cc 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -170,8 +170,9 @@
         # Set MATCHMAKER_REDIS_HOST if running multi-node.
         MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1}
         iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST
-    elif is_service_enabled qpid; then
+    elif is_service_enabled qpid || [ -n "$QPID_HOST" ]; then
         iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_qpid
+        iniset $file $section qpid_hostname $QPID_HOST
         if is_ubuntu; then
             QPID_PASSWORD=`sudo strings /etc/qpid/qpidd.sasldb | grep -B1 admin | head -1`
             iniset $file $section qpid_password $QPID_PASSWORD