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

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 410bb5ee8..a546aee85 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -2,7 +2,7 @@ class hardware::raid::proliant {
 
 	site::aptrepo { 'debian.restricted':
 		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny-restricted',
+		suite      => "${::lsbdistcodename}-restricted",
 		components => 'non-free',
 	}
 
@@ -10,12 +10,11 @@ class hardware::raid::proliant {
 		ensure  => installed,
 		tag    => extra_repo,
 	}
-	package { 'hp-health':
-		ensure => installed,
-		tag    => extra_repo,
-	}
-	package { 'arrayprobe':
-		ensure => installed,
+	if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5"]) {
+		package { 'hp-health':
+			ensure => installed,
+			tag    => extra_repo,
+		}
 	}
 
 	if $::debarchitecture == 'amd64' {