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

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index 711703b78..036008724 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,5 +1,5 @@
 class hardware::raid::proliant {
-	if $::smartarraycontroller {
+	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
 		site::aptrepo { 'debian.restricted':
 			url        => 'http://db.debian.org/debian-admin',
 			suite      => "${::lsbdistcodename}-restricted",
@@ -27,18 +27,23 @@ class hardware::raid::proliant {
 			}
 		}
 
-		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
+		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'
+			}
 
+			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 ${cmd}
+					| EOF
+			}
 		}
+		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
 		site::aptrepo { 'debian.restricted':
 			ensure => absent,