aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Bouchard <bouchard.louis@gmail.com>2017-06-16 21:00:09 +0200
committerAdam Stokes <battlemidget@users.noreply.github.com>2017-06-16 15:00:09 -0400
commit2734e5b84c25987b2135695d41aa4b0ed93ed942 (patch)
tree23c761fa786bfd7b0c40dc856254d4c9bfd13b31
parent749638157d52092f38fd54ddaee769c86217fb50 (diff)
downloadsos-2734e5b84c25987b2135695d41aa4b0ed93ed942.tar.gz
[iscsi] Enable plugin for Ubuntu and Debian (#932)
Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com> Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
-rw-r--r--sos/plugins/iscsi.py24
1 files changed, 17 insertions, 7 deletions
diff --git a/sos/plugins/iscsi.py b/sos/plugins/iscsi.py
index a81ca528..7324b262 100644
--- a/sos/plugins/iscsi.py
+++ b/sos/plugins/iscsi.py
@@ -14,7 +14,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-from sos.plugins import Plugin, RedHatPlugin
+from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
class Iscsi(Plugin):
@@ -24,13 +24,7 @@ class Iscsi(Plugin):
plugin_name = "iscsi"
profiles = ('storage',)
-
-class RedHatIscsi(Iscsi, RedHatPlugin):
-
- packages = ('iscsi-initiator-utils',)
-
def setup(self):
- super(RedHatIscsi, self).setup()
self.add_copy_spec([
"/etc/iscsi/iscsid.conf",
"/etc/iscsi/initiatorname.iscsi",
@@ -43,4 +37,20 @@ class RedHatIscsi(Iscsi, RedHatPlugin):
"iscsiadm -m node --op=show"
])
+
+class RedHatIscsi(Iscsi, RedHatPlugin):
+
+ packages = ('iscsi-initiator-utils',)
+
+ def setup(self):
+ super(RedHatIscsi, self).setup()
+
+
+class DebianIscsi(Iscsi, DebianPlugin, UbuntuPlugin):
+
+ packages = ('open-iscsi',)
+
+ def setup(self):
+ super(DebianIscsi, self).setup()
+
# vim: set et ts=4 sw=4 :