diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2021-03-15 09:09:51 +0100 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2021-03-16 12:23:59 -0400 |
| commit | 4fb834ec862228afb276ccbd45aa86c66044ea66 (patch) | |
| tree | 9476a89bcfef5f629c3616d301a274b859c057b6 | |
| parent | 56791de27de4ccb6dffb83c94722a7776ebf0cd0 (diff) | |
| download | sos-4fb834ec862228afb276ccbd45aa86c66044ea66.tar.gz | |
[gluster] collect public keys from the right dir
Collection of glusterfind dir is achieved by /var/lib/gluster
so it doesn't be collected explicitly.
/var/lib/glusterd/glusterfind/.keys/ subdir is required to be
explicitly collected, as add_copy_spec uses glob.glob() that skips
hidden files.
Resolves: #2451
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/report/plugins/gluster.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sos/report/plugins/gluster.py b/sos/report/plugins/gluster.py index e1a89df2..952cab63 100644 --- a/sos/report/plugins/gluster.py +++ b/sos/report/plugins/gluster.py @@ -76,9 +76,8 @@ class Gluster(Plugin, RedHatPlugin): "/var/lib/glusterd/", # collect nfs-ganesha related configuration "/run/gluster/shared_storage/nfs-ganesha/", - # collect status files and public ssh keys - "/var/lib/glusterd/.keys/", - "/var/lib/glusterd/glusterfind/" + # collect public ssh keys (a_s_c skips implicit hidden files) + "/var/lib/glusterd/glusterfind/.keys/", ] + glob.glob('/run/gluster/*tier-dht/*')) if not self.get_option("all_logs"): |