Adding plugins foreman and katello

Since CloudForms 1.0 has been renamed to Satellite 6.0, I am deleting this
plugin and providing two other plugins. Both projects Katello and Foreman
are upstream projects for Satellite 6.0 Red Hat products. Since both
projects support deployment on non-redhat systems, they both deliver own
reporting script that collects information from target system. Both scripts
have options not to create tarball and to provide output to desired
directory. This has been tested on RHEL 6.4.

Signed-off-by: Lukas Zapletal <lzap+git@redhat.com>
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

3 files changed, 72 insertions, 38 deletions

diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py
deleted file mode 100644
index 9f1721fd..00000000
--- a/sos/plugins/cloudforms.py
+++ /dev/null
@@ -1,38 +0,0 @@
-## Copyright (C) 2012 Red Hat Inc., Bryn M. Reeves <bmr@redhat.com>
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-from sos.plugins import Plugin, RedHatPlugin
-import os
-
-class Cloudforms(Plugin, RedHatPlugin):
-    """CloudForms related information
-    """
-
-    plugin_name = 'cloudforms'
-    packages = ["katello", "katello-common",
-                    "katello-headpin", "aeoleus-conductor"]
-    files = ["/usr/share/katello/script/katello-debug",
-                "aeolus-debug"]
-
-    def setup(self):
-        katello_debug = "/usr/share/katello/script/katello-debug"
-        aeolus_debug = "aeolus-debug"
-        if os.path.isfile(katello_debug):
-            katello_debug_path = os.path.join(self.get_cmd_path(), "katello-debug")
-            self.add_cmd_output("%s --notar -d %s" % (katello_debug, katello_debug_path))
-        if os.path.isfile(aeolus_debug):
-            aeolus_debug_path = os.path.join(self.get_cmd_path(), "aeolus-debug")
-            self.add_cmd_output("%s --notar -d %s" % (aeolus_debug, aeolus_debug_path))
-
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
new file mode 100644
index 00000000..60ec34df
--- /dev/null
+++ b/sos/plugins/foreman.py
@@ -0,0 +1,36 @@
+## Copyright (C) 2013 Red Hat, Inc., Lukas Zapletal <lzap@redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+import os
+
+class foreman(sos.plugintools.PluginBase):
+    """Foreman project related information
+    """
+
+    def defaultenabled(self):
+        return True
+
+    def checkenabled(self):
+        self.packages = ["foreman"]
+        self.files = ["/usr/sbin/foreman-debug"]
+        return sos.plugintools.PluginBase.checkenabled(self)
+
+    def setup(self):
+        foreman_debug = "/usr/sbin/foreman-debug"
+        if os.path.isfile(foreman_debug):
+            foreman_debug_path = os.path.join(self.cInfo['dstroot'],"foreman-debug")
+            self.collectExtOutput("%s -a -d %s" % (foreman_debug, foreman_debug_path))
diff --git a/sos/plugins/katello.py b/sos/plugins/katello.py
new file mode 100644
index 00000000..54b30fac
--- /dev/null
+++ b/sos/plugins/katello.py
@@ -0,0 +1,36 @@
+## Copyright (C) 2013 Red Hat, Inc., Lukas Zapletal <lzap@redhat.com>
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import sos.plugintools
+import os
+
+class katello(sos.plugintools.PluginBase):
+    """Katello project related information
+    """
+
+    def defaultenabled(self):
+        return True
+
+    def checkenabled(self):
+        self.packages = ["katello", "katello-common", "katello-headpin"]
+        self.files = ["/usr/bin/katello-debug"]
+        return sos.plugintools.PluginBase.checkenabled(self)
+
+    def setup(self):
+        katello_debug = "/usr/bin/katello-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))