openstack/oslo.messaging
Code Issues Proposed changes

[simulator] Fix transport_url usage

Browse Source 
1) Remove hardcoding 'redis' matchmaker from any zmq:// transport because it's
   fails in cases zmq+etcd:// or zmq+sentinel:// urls.
2) Allow to use transport_url from config file by removing default value for
   args.url option. In this case by default args.url is None and
   transport_url will be used from config file.

Change-Id: I1edcabe46b1e92dd4e6eccc9151b50d03f394186
This commit is contained in:
Kirill Bespalov 2016-10-19 14:07:30 +03:00
parent 874a69b0cd
commit 401102daab
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/simulator.py
View File

@ -693,7 +693,6 @@ def main():
usage=USAGE, usage=USAGE,
) )
parser.add_argument('--url', dest='url', parser.add_argument('--url', dest='url',
default='rabbit://guest:password@localhost/',
help="oslo.messaging transport url") help="oslo.messaging transport url")
parser.add_argument('-d', '--debug', dest='debug', action='store_true', parser.add_argument('-d', '--debug', dest='debug', action='store_true',
help="Turn on DEBUG logging level instead of WARN") help="Turn on DEBUG logging level instead of WARN")
@ -788,9 +787,6 @@ def main():
if args.mode == 'rpc-server': if args.mode == 'rpc-server':
target = messaging.Target(topic=args.topic, server=args.server) target = messaging.Target(topic=args.topic, server=args.server)
if args.url.startswith('zmq'):
cfg.CONF.oslo_messaging_zmq.rpc_zmq_matchmaker = "redis"
endpoint = rpc_server(TRANSPORT, target, args.wait_before_answer, endpoint = rpc_server(TRANSPORT, target, args.wait_before_answer,
args.executor, args.duration) args.executor, args.duration)
show_server_stats(endpoint, args.json_filename) show_server_stats(endpoint, args.json_filename)