openstack/oslo.messaging
Code Issues Proposed changes

Merge "Use oslo_config new type PortOpt for port options"

Browse Source
This commit is contained in:
Jenkins 2015-11-25 19:46:31 +00:00 committed by Gerrit Code Review
commit a8c6a67c18
3 changed files with 12 additions and 10 deletions
oslo_messaging/_drivers
impl_rabbit.pyimpl_zmq.py
zmq_driver/matchmaker
matchmaker_redis.py

8
oslo_messaging/_drivers/impl_rabbit.py

@ -89,10 +89,10 @@ rabbit_opts = [
deprecated_group='DEFAULT',
help='The RabbitMQ broker address where a single node is '
'used.'),
cfg.IntOpt('rabbit_port',
default=5672,
deprecated_group='DEFAULT',
help='The RabbitMQ broker port where a single node is used.'),
cfg.PortOpt('rabbit_port',
default=5672,
deprecated_group='DEFAULT',
help='The RabbitMQ broker port where a single node is used.'),
cfg.ListOpt('rabbit_hosts',
default=['$rabbit_host:$rabbit_port'],
deprecated_group='DEFAULT',

8
oslo_messaging/_drivers/impl_zmq.py

@ -81,11 +81,13 @@ zmq_opts = [
default=True,
help='Shows whether zmq-messaging uses broker or not.'),
cfg.IntOpt('rpc_zmq_min_port',
default=49152,
help='Minimal port number for random ports range.'),
cfg.PortOpt('rpc_zmq_min_port',
default=49152,
help='Minimal port number for random ports range.'),
cfg.IntOpt('rpc_zmq_max_port',
min=1,
max=65536,
default=65536,
help='Maximal port number for random ports range.'),

6
oslo_messaging/_drivers/zmq_driver/matchmaker/matchmaker_redis.py

@ -27,9 +27,9 @@ matchmaker_redis_opts = [
cfg.StrOpt('host',
default='127.0.0.1',
help='Host to locate redis.'),
cfg.IntOpt('port',
default=6379,
help='Use this port to connect to redis host.'),
cfg.PortOpt('port',
default=6379,
help='Use this port to connect to redis host.'),
cfg.StrOpt('password',
default='',
secret=True,