|
 |
6b17e9 |
commit 038609bacd8fc6a21eb50f7722f13baa5884a6bb
|
|
|
6b17e9 |
Author: Bryn M. Reeves <bmr@redhat.com>
|
|
|
6b17e9 |
Date: Tue Oct 29 16:03:03 2013 +0000
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Remove version checks in gluster plug-in
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Current distributions do not include the legac package versions
|
|
|
6b17e9 |
that the plug-in was checking for.
|
|
|
6b17e9 |
|
|
|
6b17e9 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
6b17e9 |
|
|
|
6b17e9 |
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
|
|
|
6b17e9 |
index a535d79..7c54fa0 100644
|
|
|
6b17e9 |
--- a/sos/plugins/gluster.py
|
|
|
6b17e9 |
+++ b/sos/plugins/gluster.py
|
|
|
6b17e9 |
@@ -80,22 +80,8 @@ class Gluster(Plugin, RedHatPlugin):
|
|
|
6b17e9 |
def setup(self):
|
|
|
6b17e9 |
self.add_cmd_output("gluster peer status")
|
|
|
6b17e9 |
|
|
|
6b17e9 |
- # check package version handling rename of glusterfs-core -> glusterfs
|
|
|
6b17e9 |
- pkg = self.policy().pkg_by_name("glusterfs-core");
|
|
|
6b17e9 |
- if not pkg:
|
|
|
6b17e9 |
- pkg = self.policy().pkg_by_name("glusterfs");
|
|
|
6b17e9 |
- # need to handle "no package" case for users who enable with -e/-o
|
|
|
6b17e9 |
- if not pkg:
|
|
|
6b17e9 |
- return
|
|
|
6b17e9 |
-
|
|
|
6b17e9 |
- gluster_major = int((pkg["version"])[:1])
|
|
|
6b17e9 |
- gluster_minor = int((pkg["version"])[2:3])
|
|
|
6b17e9 |
- if (gluster_major == 3) and (gluster_minor <= 2):
|
|
|
6b17e9 |
- self.add_copy_spec("/etc/glusterd/")
|
|
|
6b17e9 |
- self.add_forbidden_path("/etc/glusterd/geo-replication/secret.pem")
|
|
|
6b17e9 |
- else:
|
|
|
6b17e9 |
- self.add_copy_spec("/var/lib/glusterd/")
|
|
|
6b17e9 |
- self.add_forbidden_path("/var/lib/glusterd/geo-replication/secret.pem")
|
|
|
6b17e9 |
+ self.add_copy_spec("/var/lib/glusterd/")
|
|
|
6b17e9 |
+ self.add_forbidden_path("/var/lib/glusterd/geo-replication/secret.pem")
|
|
|
6b17e9 |
|
|
|
6b17e9 |
# collect unified file and object storage configuration
|
|
|
6b17e9 |
self.add_copy_spec("/etc/swift/")
|