From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 00:24:18 +0000 (-0600)
Subject: qa/tasks/cephadm: archive /var/log/ceph logs too (not just cluster dir)
X-Git-Tag: v15.1.0~390^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=272225c4be2103a816e31220194555aa8327ac79;p=ceph.git

qa/tasks/cephadm: archive /var/log/ceph logs too (not just cluster dir)

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 2ab0fd5d252..01bf8fe1df7 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -197,7 +197,7 @@ def ceph_log(ctx, config):
                     args=[
                         'sudo',
                         'find',
-                        '/var/log/ceph/' + fsid,
+                        '/var/log/ceph',   # all logs, not just for the cluster
                         '-name',
                         '*.log',
                         '-print0',
@@ -226,7 +226,7 @@ def ceph_log(ctx, config):
                     os.makedirs(sub)
                 except OSError:
                     pass
-                teuthology.pull_directory(remote, '/var/log/ceph/' + fsid,
+                teuthology.pull_directory(remote, '/var/log/ceph',  # everything
                                           os.path.join(sub, 'log'))
 
 @contextlib.contextmanager