X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=a19ec2849f2153f9fda6812bcfb57f174b24c828;hb=46b2d929a6980f899d9de827b26c2ad649537242;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..a19ec2849 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,32 +1,34 @@
 class hardware::raid::proliant {
+	if $::smartarraycontroller {
+		site::aptrepo { 'debian.restricted':
+			url        => 'http://db.debian.org/debian-admin',
+			suite      => "${::lsbdistcodename}-restricted",
+			components => 'non-free',
+		}
 
-	site::aptrepo { 'debian.restricted':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny-restricted',
-		components => 'non-free',
-	}
-
-	package { 'hpacucli':
-		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,
-	}
+		package { 'hpacucli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		package { 'hpssacli':
+			ensure  => installed,
+			tag    => extra_repo,
+		}
+		if !("$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5", "ProLiant ML150 G5"]) {
+			package { 'hp-health':
+				ensure => installed,
+				tag    => extra_repo,
+			}
+		}
 
-	if $::debarchitecture == 'amd64' {
-		package { 'lib32gcc1':
-			ensure => installed,
+		if $::debarchitecture == 'amd64' {
+			package { 'lib32gcc1':
+				ensure => installed,
+			}
+		}
+	} else {
+		site::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
 	}
 }