X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=f877cf5b8b138299a1f6528f9ad91c3c3a48c5a7;hb=0e375233af569acc80ddd55b3e0b4d522eabb04c;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..f877cf5b8 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,32 +1,47 @@
 class hardware::raid::proliant {
+	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
+		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,
+			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,
+			}
+		}
 
-	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,
-	}
+		if $::debarchitecture == 'amd64' {
+			package { 'lib32gcc1':
+				ensure => installed,
+			}
+		}
 
-	if $::debarchitecture == 'amd64' {
-		package { 'lib32gcc1':
-			ensure => installed,
+		if $::smartarraycontroller_hpsa {
+			concat::fragment { 'dsa-check-hpssacli':
+				target => '/etc/cron.d/puppet-nagios-wraps',
+				order  => '020',
+				content  => @(EOF)
+					27 */2 * * * root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
+					| EOF
+			}
+		}
+		file { '/etc/cron.d/puppet-nagios-hpsa':
+			ensure => absent,
+		}
+	} else {
+		site::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
 	}
 }