X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=a546aee857f5980d7790ecce96188d1b30e613d7;hb=d63828e8e785df25d1cbe2b2f07208834d851706;hp=574d601e7da8d9360d21751b018a4f723b493bb5;hpb=40ccbb8afd9beaa8f41ee20d19aabe13dcd4f509;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 574d601e7..a546aee85 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -2,26 +2,19 @@ class hardware::raid::proliant {
 
 	site::aptrepo { 'debian.restricted':
 		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny-restricted',
+		suite      => "${::lsbdistcodename}-restricted",
 		components => 'non-free',
 	}
 
 	package { 'hpacucli':
 		ensure  => installed,
-		require => [
-			File['/etc/apt/sources.list.d/debian.restricted.list'],
-			Exec['apt-get update']
-		]
+		tag    => extra_repo,
 	}
-	package { 'hp-health':
-		ensure => installed,
-		require => [
-			File['/etc/apt/sources.list.d/debian.restricted.list'],
-			Exec['apt-get update']
-		]
-	}
-	package { 'arrayprobe':
-		ensure => installed,
+	if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5"]) {
+		package { 'hp-health':
+			ensure => installed,
+			tag    => extra_repo,
+		}
 	}
 
 	if $::debarchitecture == 'amd64' {