From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 27 Apr 2017 18:46:06 +0000 (-0400)
Subject: qa/rgw: add cluster name to path when s3tests scans rgw log
X-Git-Tag: v12.0.3~155^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a31aa6f65c7e73c62ba880db5a58e59f2f46b430;p=ceph.git

qa/rgw: add cluster name to path when s3tests scans rgw log

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 4fbea2f64c8e..762eff267586 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -381,13 +381,15 @@ def scan_for_leaked_encryption_keys(ctx, config):
         for client, client_config in config.iteritems():
             if not client_config.get('scan_for_encryption_keys', True):
                 continue
+            cluster_name, daemon_type, client_id = teuthology.split_role(client)
+            client_with_cluster = '.'.join((cluster_name, daemon_type, client_id))
             (remote,) = ctx.cluster.only(client).remotes.keys()
             proc = remote.run(
                 args=[
                     'grep',
                     '--binary-files=text',
                     s3test_customer_key,
-                    '/var/log/ceph/rgw.{client}.log'.format(client=client),
+                    '/var/log/ceph/rgw.{client}.log'.format(client=client_with_cluster),
                 ],
                 wait=False,
                 check_status=False,