qa/rgw: loop over clients instead of config keys
authorCasey Bodley <cbodley@redhat.com>
Mon, 5 Mar 2018 20:22:53 +0000 (15:22 -0500)
committerCasey Bodley <cbodley@redhat.com>
Fri, 9 Mar 2018 21:31:33 +0000 (16:31 -0500)
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 <cbodley@redhat.com>
qa/tasks/rgw.py

index e093c96b4e2d364311ef8e6580cbf0c0fdb3be43..24b7e89b2aaded977265ad12afdfb3c513a600ad 100644 (file)
@@ -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