X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=78c5422a73342c5bc54d77fe442641585600dc21;hb=a2afb600d7d2187b16da01c98a50f00f06aea6a6;hp=a546aee857f5980d7790ecce96188d1b30e613d7;hpb=cefc704c6ba62d49487565d06cc00ce2aa03311d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index a546aee85..78c5422a7 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,25 +1,51 @@
 class hardware::raid::proliant {
+	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
+		base::aptrepo { 'debian.restricted':
+			ensure => absent,
+		}
+		include debian_org::apt_restricted
 
-	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 $::smartarraycontroller_hpsa {
+			$cmd = $hostname ? {
+				'lobos' => 'dsa-check-hpssacli --no-battery',
+				'villa' => 'dsa-check-hpssacli --no-battery',
+				'lw08'  => 'dsa-check-hpssacli --no-battery --ignore-cache',
+				default => 'dsa-check-hpssacli'
+			}
 
-	if $::debarchitecture == 'amd64' {
-		package { 'lib32gcc1':
-			ensure => installed,
+			concat::fragment { 'puppet-crontab--nagios--dsa-check-hpssacli':
+				target => '/etc/cron.d/puppet-crontab',
+				order  => '020',
+				content  => @("EOF")
+					27 */2 * * * root sleep $(( RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
+					| EOF
+			}
+		}
+		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
+	} else {
+		base::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
 	}
 }