X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fdell.pp;h=8e56c6130c4727f900d1d82950a7abd38ca145d3;hb=e15a0448ceb332965f469910452465ba42c21d85;hp=f81ec740525c5c5e73caa02a238d049fd3965329;hpb=ca80f6b41f4be9dcee7c1e7712e3c8473cb3ad84;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
index f81ec7405..8e56c6130 100644
--- a/modules/hardware/manifests/raid/dell.pp
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -1,12 +1,29 @@
 class hardware::raid::dell {
-	site::aptrepo { 'debian.restricted':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'jessie-restricted',
-		components => 'non-free',
-	}
+	if "$::manufacturer" == "Dell Inc." {
+		include debian_org::apt_restricted
+
+		package { 'srvadmin-server-cli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'srvadmin-storage-cli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'srvadmin-omcommon':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'libssl1.0.0':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
 
-	package { 'srvadmin-all':
-		ensure  => installed,
-		tag    => extra_repo,
+	}
+	site::aptrepo { 'jessie.dell':
+		ensure => absent,
+	}
+	site::aptrepo { 'debian.restricted.dell':
+		ensure => absent,
 	}
 }