summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-21 17:16:30 +0000
committerGerrit Code Review <review@openstack.org>2013-10-21 17:16:30 +0000
commit0b8f688efd8a08f6202a117fb1d519cdb8f98331 (patch)
treea6289db61b8cf82df8b7f13877150fa8a9bee06e
parentb2cef2460392e36dda6da434a4493bded2a61bfb (diff)
parent3a2a4d9831f3786b19424ee0d29847d95c5cd871 (diff)
downloadoslo-messaging-0b8f688efd8a08f6202a117fb1d519cdb8f98331.tar.gz
Merge "Make rpc_backend default to 'rabbit'"
-rw-r--r--oslo/messaging/transport.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/oslo/messaging/transport.py b/oslo/messaging/transport.py
index 62a5480..2a154c5 100644
--- a/oslo/messaging/transport.py
+++ b/oslo/messaging/transport.py
@@ -43,8 +43,8 @@ _transport_opts = [
'full configuration. If not set, we fall back to the '
'rpc_backend option and driver specific configuration.'),
cfg.StrOpt('rpc_backend',
- default='kombu',
- help='The messaging driver to use, defaults to kombu. Other '
+ default='rabbit',
+ help='The messaging driver to use, defaults to rabbit. Other '
'drivers include qpid and zmq.'),
cfg.StrOpt('control_exchange',
default='openstack',