openstack/devstack
Code Issues Proposed changes

Merge "Fix oslo_messaging package and related object names"

Browse Source
This commit is contained in:
Jenkins 2015-02-02 15:38:21 +00:00 committed by Gerrit Code Review
commit 5733abbc55
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rpc_backend
View File

@ -243,7 +243,7 @@ function iniset_rpc_backend {
if is_service_enabled zeromq; then if is_service_enabled zeromq; then
iniset $file $section rpc_backend "zmq" iniset $file $section rpc_backend "zmq"
iniset $file $section rpc_zmq_matchmaker \ iniset $file $section rpc_zmq_matchmaker \
oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis oslo_messaging._drivers.matchmaker_redis.MatchMakerRedis
# Set MATCHMAKER_REDIS_HOST if running multi-node. # Set MATCHMAKER_REDIS_HOST if running multi-node.
MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1} MATCHMAKER_REDIS_HOST=${MATCHMAKER_REDIS_HOST:-127.0.0.1}
iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST iniset $file matchmaker_redis host $MATCHMAKER_REDIS_HOST
@ -252,7 +252,7 @@ function iniset_rpc_backend {
if [ "$RPC_MESSAGING_PROTOCOL" == "AMQP1" ]; then if [ "$RPC_MESSAGING_PROTOCOL" == "AMQP1" ]; then
iniset $file $section rpc_backend "amqp" iniset $file $section rpc_backend "amqp"
else else
iniset $file $section rpc_backend ${package}.openstack.common.rpc.impl_qpid iniset $file $section rpc_backend "qpid"
fi fi
iniset $file $section qpid_hostname ${QPID_HOST:-$SERVICE_HOST} iniset $file $section qpid_hostname ${QPID_HOST:-$SERVICE_HOST}
if [ -n "$QPID_USERNAME" ]; then if [ -n "$QPID_USERNAME" ]; then
@ -260,7 +260,7 @@ function iniset_rpc_backend {
iniset $file $section qpid_password $QPID_PASSWORD iniset $file $section qpid_password $QPID_PASSWORD
fi fi
elif is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; 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 rpc_backend "rabbit"
iniset $file $section rabbit_hosts $RABBIT_HOST iniset $file $section rabbit_hosts $RABBIT_HOST
iniset $file $section rabbit_password $RABBIT_PASSWORD iniset $file $section rabbit_password $RABBIT_PASSWORD
iniset $file $section rabbit_userid $RABBIT_USERID iniset $file $section rabbit_userid $RABBIT_USERID