When deploying OpenStack in a multi-node configuration,
the Qpid clients need the hostname of the potentially
remote Qpid server in order to permit the necessary RPC
communication between components.
Fixes bug #1196521
Change-Id: Iee3c3747cedea9488ec345e78f8eddbc6e850573
... | ... |
@@ -170,8 +170,9 @@ function iniset_rpc_backend() { |
170 | 170 |
# Set MATCHMAKER_REDIS_HOST if running multi-node. |
171 | 171 |
MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1} |
172 | 172 |
iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST |
173 |
- elif is_service_enabled qpid; then |
|
173 |
+ elif is_service_enabled qpid || [ -n "$QPID_HOST" ]; then |
|
174 | 174 |
iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_qpid |
175 |
+ iniset $file $section qpid_hostname $QPID_HOST |
|
175 | 176 |
if is_ubuntu; then |
176 | 177 |
QPID_PASSWORD=`sudo strings /etc/qpid/qpidd.sasldb | grep -B1 admin | head -1` |
177 | 178 |
iniset $file $section qpid_password $QPID_PASSWORD |