89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
89 lines
2.9 KiB
Diff
89 lines
2.9 KiB
Diff
From f1a7aea0f45485cbe12e95f38c6b0dc6ad12dd58 Mon Sep 17 00:00:00 2001
|
|
From: Poornima <pkshiras@redhat.com>
|
|
Date: Thu, 9 Apr 2015 18:47:58 +0530
|
|
Subject: [PATCH] [openstack_sahara] add new plugin
|
|
|
|
Capture configuration and log data for the OpenStack Sahara project
|
|
(formerly Savanna). Sahara is a tool to simplify the deployment of
|
|
data-intensive applications in OpenStack environments.
|
|
|
|
Signed-off-by: Poornima M. Kshirsagar pkshiras@redhat.com
|
|
Signed-off-by: Bryn M. Reeves bmr@redhat.com
|
|
---
|
|
sos/plugins/openstack_sahara.py | 63 +++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 63 insertions(+)
|
|
create mode 100644 sos/plugins/openstack_sahara.py
|
|
|
|
diff --git a/sos/plugins/openstack_sahara.py b/sos/plugins/openstack_sahara.py
|
|
new file mode 100644
|
|
index 0000000..f0b95e4
|
|
--- /dev/null
|
|
+++ b/sos/plugins/openstack_sahara.py
|
|
@@ -0,0 +1,63 @@
|
|
+# Copyright (C) 2015 Red Hat, Inc.,Poornima M. Kshirsagar <pkshiras@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, DebianPlugin, UbuntuPlugin
|
|
+
|
|
+
|
|
+class OpenStackSahara(Plugin):
|
|
+ """OpenStack Sahara"""
|
|
+ plugin_name = 'openstack_sahara'
|
|
+ profiles = ('openstack',)
|
|
+
|
|
+ option_list = [("log", "gathers openstack sahara logs", "slow", True)]
|
|
+
|
|
+ def setup(self):
|
|
+ self.add_copy_spec("/etc/sahara/")
|
|
+ self.add_cmd_output("journalctl -u openstack-sahara-all")
|
|
+
|
|
+ if self.get_option("log"):
|
|
+ self.add_copy_spec("/var/log/sahara/")
|
|
+
|
|
+
|
|
+class DebianOpenStackSahara(OpenStackSahara, DebianPlugin, UbuntuPlugin):
|
|
+ """OpenStackSahara related information for Debian based distributions."""
|
|
+
|
|
+ packages = (
|
|
+ 'sahara-api',
|
|
+ 'sahara-common',
|
|
+ 'sahara-engine',
|
|
+ 'python-sahara',
|
|
+ 'python-saharaclient',
|
|
+ )
|
|
+
|
|
+ def setup(self):
|
|
+ super(DebianOpenStackSahara, self).setup()
|
|
+
|
|
+
|
|
+class RedHatOpenStackSahara(OpenStackSahara, RedHatPlugin):
|
|
+ """OpenStack sahara related information for Red Hat distributions."""
|
|
+
|
|
+ packages = (
|
|
+ 'openstack-sahara',
|
|
+ 'python-saharaclient'
|
|
+ )
|
|
+
|
|
+ def setup(self):
|
|
+ super(RedHatOpenStackSahara, self).setup()
|
|
+ self.add_copy_spec("/etc/sudoers.d/sahara")
|
|
+
|
|
+
|
|
+# vim: et ts=4 sw=4
|
|
--
|
|
1.8.3.1
|
|
|