diff options
| author | Adam Stokes <ajs@redhat.com> | 2010-07-29 09:00:00 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-01-16 19:42:34 +0000 |
| commit | 0fe72dfd92ec1c7d09724e0eab0675bc8536773e (patch) | |
| tree | a132e832d7c3105b4467b80fd26cc35f62eccd8b | |
| parent | 5fb83ab1c0f5f86452cf87b9a9e8b30583fb289f (diff) | |
| download | sos-0fe72dfd92ec1c7d09724e0eab0675bc8536773e.tar.gz | |
Fix cluster diagnostics and update packages and services for RHEL6
Resolves: bz582259
| -rw-r--r-- | sos/plugins/cluster.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py index e60ccf92..16a88d76 100644 --- a/sos/plugins/cluster.py +++ b/sos/plugins/cluster.py @@ -34,7 +34,8 @@ class cluster(sos.plugintools.PluginBase): "gfs-utils", "gnbd", "kmod-gfs", "kmod-gnbd", "lvm2-cluster", "gfs2-utils" ] elif rhelver == 6: - self.packages = [ "luci", "ricci" ] + self.packages = [ "ricci", "corosync", "openais", + "cman", "clusterlib", "fence-agents" ] self.files = [ "/etc/cluster/cluster.conf" ] return sos.plugintools.PluginBase.checkenabled(self) @@ -69,6 +70,10 @@ class cluster(sos.plugintools.PluginBase): serv_check.extend( [ "cman", "rgmanager" ] ) if self.has_gfs(): serv_check.extend( ["gfs", "clvmd"] ) + elif rhelver == 6: + serv_check.extend( [ "fenced", "corosync", "dlm_controld"] ) + if self.has_gfs(): + serv_check.extend( ["gfs_controld"] ) # check that kernel module packages are installed for # running kernel version @@ -156,7 +161,8 @@ class cluster(sos.plugintools.PluginBase): self.addDiagnose("one or more nodes have manual fencing agent configured (data integrity is not guaranteed)") # if fence_ilo or fence_drac, make sure acpid is not running - ret, hostname, time = self.callExtProg("/bin/uname -n").split(".")[0] + ret, hostname, time = self.callExtProg("/bin/uname -n") + hostname = hostname.split(".")[0] if len(xpathContext.xpathEval('/cluster/clusternodes/clusternode[@name = "%s" and /cluster/fencedevices/fencedevice[@agent="fence_rsa" or @agent="fence_drac"]/@name=fence/method/device/@name]' % hostname )): ret, out, time = self.callExtProg("/sbin/service acpid status") if ret == 0 or self.policy().runlevelDefault() in self.policy().runlevelByService("acpid"): |