|
 |
2ed6e8 |
From 4fb834ec862228afb276ccbd45aa86c66044ea66 Mon Sep 17 00:00:00 2001
|
|
|
2ed6e8 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
2ed6e8 |
Date: Mon, 15 Mar 2021 09:09:51 +0100
|
|
|
2ed6e8 |
Subject: [PATCH] [gluster] collect public keys from the right dir
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
Collection of glusterfind dir is achieved by /var/lib/gluster
|
|
|
2ed6e8 |
so it doesn't be collected explicitly.
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
/var/lib/glusterd/glusterfind/.keys/ subdir is required to be
|
|
|
2ed6e8 |
explicitly collected, as add_copy_spec uses glob.glob() that skips
|
|
|
2ed6e8 |
hidden files.
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
Resolves: #2451
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
2ed6e8 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
2ed6e8 |
---
|
|
|
2ed6e8 |
sos/report/plugins/gluster.py | 5 ++---
|
|
|
2ed6e8 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
diff --git a/sos/report/plugins/gluster.py b/sos/report/plugins/gluster.py
|
|
|
2ed6e8 |
index e1a89df2..952cab63 100644
|
|
|
2ed6e8 |
--- a/sos/report/plugins/gluster.py
|
|
|
2ed6e8 |
+++ b/sos/report/plugins/gluster.py
|
|
|
2ed6e8 |
@@ -76,9 +76,8 @@ class Gluster(Plugin, RedHatPlugin):
|
|
|
2ed6e8 |
"/var/lib/glusterd/",
|
|
|
2ed6e8 |
# collect nfs-ganesha related configuration
|
|
|
2ed6e8 |
"/run/gluster/shared_storage/nfs-ganesha/",
|
|
|
2ed6e8 |
- # collect status files and public ssh keys
|
|
|
2ed6e8 |
- "/var/lib/glusterd/.keys/",
|
|
|
2ed6e8 |
- "/var/lib/glusterd/glusterfind/"
|
|
|
2ed6e8 |
+ # collect public ssh keys (a_s_c skips implicit hidden files)
|
|
|
2ed6e8 |
+ "/var/lib/glusterd/glusterfind/.keys/",
|
|
|
2ed6e8 |
] + glob.glob('/run/gluster/*tier-dht/*'))
|
|
|
2ed6e8 |
|
|
|
2ed6e8 |
if not self.get_option("all_logs"):
|
|
|
2ed6e8 |
--
|
|
|
2ed6e8 |
2.26.3
|
|
|
2ed6e8 |
|