diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2015-09-15 11:06:26 -0400 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2015-09-15 11:07:44 -0400 |
| commit | 97892e656a83383e5b058f0171fd36f138d96b5b (patch) | |
| tree | e61bed2d1defa9f05bfced502ab457d13ea48ac6 /oslo_messaging/opts.py | |
| parent | c5b7ab6f1c1824d3851a5c72a2286b4ed342dde7 (diff) | |
| parent | fed1f734df42a9a6969628ac7d6a8b4c47f571d8 (diff) | |
| download | oslo-messaging-97892e656a83383e5b058f0171fd36f138d96b5b.tar.gz | |
Merge remote-tracking branch 'origin/feature/zmq' into merge-branch
Change-Id: If189d03131efc02045955508cef06fdd2ed590ee
Diffstat (limited to 'oslo_messaging/opts.py')
| -rw-r--r-- | oslo_messaging/opts.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py index 267b7ec..c585659 100644 --- a/oslo_messaging/opts.py +++ b/oslo_messaging/opts.py @@ -25,10 +25,8 @@ from oslo_messaging._drivers import base as drivers_base from oslo_messaging._drivers import impl_qpid from oslo_messaging._drivers import impl_rabbit from oslo_messaging._drivers import impl_zmq -from oslo_messaging._drivers import matchmaker -from oslo_messaging._drivers import matchmaker_redis -from oslo_messaging._drivers import matchmaker_ring from oslo_messaging._drivers.protocols.amqp import opts as amqp_opts +from oslo_messaging._drivers.zmq_driver.matchmaker import matchmaker_redis from oslo_messaging._executors import impl_pooledexecutor from oslo_messaging.notify import notifier from oslo_messaging.rpc import client @@ -37,7 +35,7 @@ from oslo_messaging import transport _global_opt_lists = [ drivers_base.base_opts, impl_zmq.zmq_opts, - matchmaker.matchmaker_opts, + matchmaker_redis.matchmaker_redis_opts, impl_pooledexecutor._pool_opts, notifier._notifier_opts, client._client_opts, @@ -47,7 +45,6 @@ _global_opt_lists = [ _opts = [ (None, list(itertools.chain(*_global_opt_lists))), ('matchmaker_redis', matchmaker_redis.matchmaker_redis_opts), - ('matchmaker_ring', matchmaker_ring.matchmaker_opts), ('oslo_messaging_amqp', amqp_opts.amqp1_opts), ('oslo_messaging_rabbit', list(itertools.chain(amqp.amqp_opts, impl_rabbit.rabbit_opts))), |