13178ca5fa
This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
diff -up sos-2.2/sos/plugins/cloudforms.py.orig ./sos/plugins/cloudforms.py
|
|
--- sos-2.2/sos/plugins/cloudforms.py.orig 2012-03-08 12:35:06.415447641 +0000
|
|
+++ sos-2.2/sos/plugins/cloudforms.py 2012-03-08 12:45:53.485443241 +0000
|
|
@@ -0,0 +1,27 @@
|
|
+import sos.plugintools
|
|
+import os
|
|
+
|
|
+class cloudforms(sos.plugintools.PluginBase):
|
|
+ """CloudForms related information
|
|
+ """
|
|
+
|
|
+ def defaultenabled(self):
|
|
+ return True
|
|
+
|
|
+ def checkenabled(self):
|
|
+ self.packages = ["katello", "katello-common",
|
|
+ "katello-headpin", "aeolus-conductor"]
|
|
+ self.files = ["/usr/share/katello/script/katello-debug",
|
|
+ "/usr/bin/aeolus-debug"]
|
|
+ return sos.plugintools.PluginBase.checkenabled(self)
|
|
+
|
|
+ def setup(self):
|
|
+ katello_debug = "/usr/share/katello/script/katello-debug"
|
|
+ aeolus_debug = "/usr/bin/aeolus-debug"
|
|
+ if os.path.isfile(katello_debug):
|
|
+ katello_debug_path = os.path.join(self.cInfo['dstroot'],"katello-debug")
|
|
+ self.collectExtOutput("%s --notar -d %s" % (katello_debug, katello_debug_path))
|
|
+ if os.path.isfile(aeolus_debug):
|
|
+ aeolus_debug_path = os.path.join(self.cInfo['dstroot'],"aeolus-debug")
|
|
+ self.collectExtOutput("%s --notar -d %s" % (aeolus_debug, aeolus_debug_path))
|
|
+
|