diff options
| author | Oleksii Zamiatin <ozamiatin@mirantis.com> | 2016-08-04 15:31:45 +0300 |
|---|---|---|
| committer | ozamiatin <ozamiatin@mirantis.com> | 2016-08-05 11:36:50 +0300 |
| commit | 7c5d039fd355e60e099a0a36408c85a08bfcc2ad (patch) | |
| tree | 76e4c69470840f0b6f2f82188ecb6bcb5834f189 /oslo_messaging/opts.py | |
| parent | b259f88b092ebed47ce2b2138f15e70d590d3535 (diff) | |
| download | oslo-messaging-7c5d039fd355e60e099a0a36408c85a08bfcc2ad.tar.gz | |
Move zmq driver options into its own group
ZeroMQ driver options are current stored into the DEFAULT group.
This change makes the zmq configuration clearer by putting its
options into oslo_messaging_zmq group.
Change-Id: Ia00fda005b1664750d2646f8c82ebdf295b156fb
Closes-bug: #1417040
Co-Authored-By: Oleksii Zamiatin <ozamiatin@mirantis.com>
Diffstat (limited to 'oslo_messaging/opts.py')
| -rw-r--r-- | oslo_messaging/opts.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oslo_messaging/opts.py b/oslo_messaging/opts.py index b04768a..c252496 100644 --- a/oslo_messaging/opts.py +++ b/oslo_messaging/opts.py @@ -25,7 +25,7 @@ from oslo_messaging._drivers.amqp1_driver import opts as amqp_opts from oslo_messaging._drivers import base as drivers_base from oslo_messaging._drivers import impl_pika from oslo_messaging._drivers import impl_rabbit -from oslo_messaging._drivers import impl_zmq +from oslo_messaging._drivers.impl_zmq import zmq_options from oslo_messaging._drivers.pika_driver import pika_connection_factory from oslo_messaging._drivers.zmq_driver.matchmaker import matchmaker_redis from oslo_messaging.notify import notifier @@ -36,7 +36,7 @@ from oslo_messaging import transport _global_opt_lists = [ drivers_base.base_opts, - impl_zmq.zmq_opts, + zmq_options.zmq_opts, server._pool_opts, client._client_opts, transport._transport_opts, @@ -45,6 +45,7 @@ _global_opt_lists = [ _opts = [ (None, list(itertools.chain(*_global_opt_lists))), ('matchmaker_redis', matchmaker_redis.matchmaker_redis_opts), + ('oslo_messaging_zmq', zmq_options.zmq_opts), ('oslo_messaging_amqp', amqp_opts.amqp1_opts), ('oslo_messaging_notifications', notifier._notifier_opts), ('oslo_messaging_rabbit', list( |