X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=a0ab33c74dbec9115e6f2072451897683e639ae3;hb=d7dff70424dc48067cd223e3bf92e54bb973afbf;hp=02f92e1901ead6e9c2d7a43f9a95d48d3343a421;hpb=a9fde6a8b81ad990c7303ce6c1de832364cd9740;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 02f92e190..a0ab33c74 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,25 +1,45 @@
 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,
-	}
-	if ! "$::systemproductname" in ["ProLiant DL180 G5", "ProLiant DL120 G5"] {
-		package { 'hp-health':
-			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,
+			}
+		}
+
+		if $::smartarraycontroller_hpsa {
+			concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
+				target => '/etc/cron.d/dsa-puppet-stuff',
+				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,
 		}
 	}
 }