diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-04 21:54:56 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-04 21:54:56 +0000 |
| commit | 5de99c52109c966ca56bb5fcdf8fd0683d5ff8a2 (patch) | |
| tree | 3e19408476315ca38908cbe9a2f1623f88efaa8a | |
| parent | da72fc4c379829ac63bb18f779305287de1c76bd (diff) | |
| download | sos-5de99c52109c966ca56bb5fcdf8fd0683d5ff8a2.tar.gz | |
Update cloudforms module to match current rhel-6
| -rw-r--r-- | sos/plugins/cloudforms.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py index 440f5512..db66d269 100644 --- a/sos/plugins/cloudforms.py +++ b/sos/plugins/cloudforms.py @@ -20,10 +20,18 @@ class cloudforms(Plugin, RedHatPlugin): """CloudForms related information """ - packages = ["katello"] + packages = ["katello", "katello-common", + "katello-headpin", "aeoleus-conductor"] + files = ["/usr/share/katello/script/katello-debug", + "/usr/bin/aeolus-debug"] def setup(self): - katello_debug = "/usr/share/katello/scripts/katello-debug" - self.collectExtOutput("%s -d %s" \ - % (katello_debug, - os.path.join(self.cInfo['dstroot'],"cloudforms"))) + 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)) + |