diff options
| author | Victor Sergeyev <vsergeyev@mirantis.com> | 2015-07-10 16:45:20 +0300 |
|---|---|---|
| committer | Victor Sergeyev <vsergeyev@mirantis.com> | 2015-07-16 09:23:46 +0000 |
| commit | 9e4831c02233a1d50ca78877e28389f5c214c562 (patch) | |
| tree | f65a889b339a73dda6650520df39f8246ac1acad /oslo_messaging/opts.py | |
| parent | ebcadf3d5e6c095c2c6e996c338fcacd1f27af25 (diff) | |
| download | oslo-messaging-9e4831c02233a1d50ca78877e28389f5c214c562.tar.gz | |
ZMQ: Initial matchmaker implementation
This patch replaces the old outdated matchmakers and replace it into the
new ones.
Call/Cast test_specific_server() functional tests passes now.
Change-Id: I8635396110d30d26812f39b242fbbabd1a0feaaa
Diffstat (limited to 'oslo_messaging/opts.py')
| -rw-r--r-- | oslo_messaging/opts.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py index 5911b69..0accf30 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 base from oslo_messaging.notify import notifier from oslo_messaging.rpc import client @@ -37,7 +35,6 @@ from oslo_messaging import transport _global_opt_lists = [ drivers_base.base_opts, impl_zmq.zmq_opts, - matchmaker.matchmaker_opts, base._pool_opts, notifier._notifier_opts, client._client_opts, @@ -47,7 +44,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))), |