X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=711703b78378de507d2109e16bb8eedefe8c6b85;hb=0564e0c6662530d56ef7276a5ecb53881a218b5a;hp=993e5de058da6a2060485b5964f0070af72ad880;hpb=8fd87401b5b7cb84eba0b83c17d07fddb2465d6d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 993e5de05..711703b78 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,24 +1,47 @@
 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,
+			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,
-	}
-	package { 'hp-health':
-		ensure => installed,
-	}
-	package { 'arrayprobe':
-		ensure => installed,
-	}
+		if $::debarchitecture == 'amd64' {
+			package { 'lib32gcc1':
+				ensure => installed,
+			}
+		}
 
-	if $::debarchitecture == 'amd64' {
-		package { 'lib32gcc1':
-			ensure => installed,
+		file { '/etc/cron.d/puppet-nagios-hpsa':
+			ensure => ($::smartarraycontroller_hpsa) ? {
+				true    => 'present',
+				default => 'absent'
+			},
+			content  => @(EOF)
+				SHELL=/bin/bash
+				PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/nagios/plugins
+				42 * * * 0 root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
+				| EOF
+
+		}
+	} else {
+		site::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
 	}
 }