From 2aca3bd8c6805aba69f09497b8ff706a244aa3e3 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 5 Mar 2018 15:22:53 -0500 Subject: [PATCH] qa/rgw: loop over clients instead of config keys we only run radosgw instances on clients that are specified directly in the rgw task - this list omits entries that are brought in via overrides Signed-off-by: Casey Bodley --- qa/tasks/rgw.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index e093c96b4e2d3..24b7e89b2aade 100644 --- a/qa/tasks/rgw.py +++ b/qa/tasks/rgw.py @@ -136,7 +136,7 @@ def start_rgw(ctx, config, clients): ) # XXX: add_daemon() doesn't let us wait until radosgw finishes startup - for client in config.keys(): + for client in clients: endpoint = ctx.rgw.role_endpoints[client] url = endpoint.url() log.info('Polling {client} until it starts accepting connections on {url}'.format(client=client, url=url)) @@ -145,7 +145,7 @@ def start_rgw(ctx, config, clients): try: yield finally: - for client in config.iterkeys(): + for client in clients: cluster_name, daemon_type, client_id = teuthology.split_role(client) client_with_id = daemon_type + '.' + client_id client_with_cluster = cluster_name + '.' + client_with_id -- 2.39.5