From 401102daabcdbb4faeddf360a9a0f2f9c004ceea Mon Sep 17 00:00:00 2001 From: Kirill Bespalov Date: Wed, 19 Oct 2016 14:07:30 +0300 Subject: [PATCH] [simulator] Fix transport_url usage 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 --- tools/simulator.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/simulator.py b/tools/simulator.py index f63028922..2e4b0c284 100755 --- a/tools/simulator.py +++ b/tools/simulator.py @@ -693,7 +693,6 @@ def main(): usage=USAGE, ) parser.add_argument('--url', dest='url', - default='rabbit://guest:password@localhost/', help="oslo.messaging transport url") parser.add_argument('-d', '--debug', dest='debug', action='store_true', help="Turn on DEBUG logging level instead of WARN") @@ -788,9 +787,6 @@ def main(): if args.mode == 'rpc-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, args.executor, args.duration) show_server_stats(endpoint, args.json_filename)