X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Fproliant.pp;h=28a177b4a7ebb4df64f0f9e343609d43f903357d;hb=9573712862a431d238cf67894f4b422794eaa78f;hp=04b9cdd39ca4bdce042f29bd96b99e11954fd4e5;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/proliant.pp b/modules/debian-org/manifests/proliant.pp
index 04b9cdd39..28a177b4a 100644
--- a/modules/debian-org/manifests/proliant.pp
+++ b/modules/debian-org/manifests/proliant.pp
@@ -1,30 +1,32 @@
 class debian-org::proliant {
 
 	site::aptrepo { 'debian.restricted':
-		template => 'debian-org/etc/apt/sources.list.d/debian.restricted.list.erb',
+		url        => 'http://db.debian.org/debian-admin',
+		suite      => 'lenny-restricted',
+		components => 'non-free',
 	}
 
 	package { 'hpacucli':
-		ensure => installed,
+		ensure  => installed,
+		require => [
+			File['/etc/apt/sources.list.d/debian.restricted.list'],
+			Exec['apt-get update']
+		]
 	}
 	package { 'hp-health':
 		ensure => installed,
+		require => [
+			File['/etc/apt/sources.list.d/debian.restricted.list'],
+			Exec['apt-get update']
+		]
 	}
 	package { 'arrayprobe':
 		ensure => installed,
 	}
 
-	if $::lsbdistcodename == 'lenny' {
-		package { 'cpqarrayd':
-			ensure => installed,
-		}
-	}
-
 	if $::debarchitecture == 'amd64' {
 		package { 'lib32gcc1':
 			ensure => installed,
 		}
 	}
 }
-
-