X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=9f9114e8c9480ecf6d02b2601611b03570f9eaf9;hb=97bb59312bddfa861db8b588a94df270320b28c1;hp=55bd740e5729cb92766d0ebe1f56e143c5222252;hpb=25df78b3a5e37ca7dc16e7dbe4e40f406771b4c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 55bd740e5..9f9114e8c 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,23 +1,46 @@
 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      => "${::lsbdistcodename}-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,
-		tag    => extra_repo,
-	}
-	package { 'hp-health':
-		ensure => installed,
-		tag    => extra_repo,
-	}
+		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',
+				content  => @(EOF)
+					27 * * * * 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,
 		}
 	}
 }