From: Julien Cristau <jcristau@debian.org>
Date: Tue, 8 Aug 2017 22:29:35 +0000 (-0400)
Subject: Add dell srvadmin tool to try and improve health monitoring
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ca80f6b41f4be9dcee7c1e7712e3c8473cb3ad84;p=mirror%2Fdsa-puppet.git

Add dell srvadmin tool to try and improve health monitoring
---

diff --git a/modules/hardware/manifests/raid.pp b/modules/hardware/manifests/raid.pp
index 1705ea83f..a31fcabc1 100644
--- a/modules/hardware/manifests/raid.pp
+++ b/modules/hardware/manifests/raid.pp
@@ -1,8 +1,8 @@
 class hardware::raid {
 	include hardware::raid::proliant
 
-	if $::productname == 'PowerEdge 2850' {
-		include hardware::raid::megactl
+	if $::productname == 'PowerEdge 1950' {
+		include hardware::raid::dell
 	}
 
 	include hardware::raid::raidmpt
diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
new file mode 100644
index 000000000..f81ec7405
--- /dev/null
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -0,0 +1,12 @@
+class hardware::raid::dell {
+	site::aptrepo { 'debian.restricted':
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => 'jessie-restricted',
+		components => 'non-free',
+	}
+
+	package { 'srvadmin-all':
+		ensure  => installed,
+		tag    => extra_repo,
+	}
+}
diff --git a/modules/hardware/manifests/raid/megactl.pp b/modules/hardware/manifests/raid/megactl.pp
deleted file mode 100644
index 60d24920f..000000000
--- a/modules/hardware/manifests/raid/megactl.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class hardware::raid::megactl {
-
-	package { 'megactl':
-		ensure => installed,
-		tag    => extra_repo,
-	}
-
-	site::aptrepo { 'debian.restricted':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny-restricted',
-		components => 'non-free',
-	}
-}