X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fdell.pp;h=b1f5fb235f196f349118917c3cb3e158e53a1e83;hb=978b3d3a80635c75775d7ae42485a8e14478eda3;hp=a69997a470d58bbe8bf86683d6c5196b76a40d42;hpb=6e9c4ff8298e3b2fac751495297a8ac02d2dd8ee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/dell.pp b/modules/hardware/manifests/raid/dell.pp
index a69997a47..b1f5fb235 100644
--- a/modules/hardware/manifests/raid/dell.pp
+++ b/modules/hardware/manifests/raid/dell.pp
@@ -1,20 +1,34 @@
 class hardware::raid::dell {
-	site::aptrepo { 'jessie.dell':
-		url        => 'http://deb.debian.org/debian',
-		suite      => 'jessie',
-		components => 'main',
-	}
-	site::aptrepo { 'debian.restricted.dell':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'jessie-restricted',
-		components => 'non-free',
-	}
+	if "$::manufacturer" == "Dell Inc." {
+		include debian_org::apt_restricted
 
-	package { 'libssl1.0.0':
-		ensure	=> installed,
+		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 { 'libxslt1.1':
+			ensure => installed,
+		}
 	}
-	package { 'srvadmin-storage-cli':
-		ensure  => installed,
-		tag    => extra_repo,
+	base::aptrepo { 'jessie.dell':
+		ensure => absent,
 	}
+	base::aptrepo { 'debian.restricted.dell':
+		ensure => absent,
+	}
+
+	# buggy and conflicts with dell's own thing
+	dsa_systemd::mask { 'openipmi.service': }
 }