X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=fab4520fa9eb98869ed74d1cc51b6138c32d212a;hb=6b572a9cba8d72b99d1a9b56d226c8d405c40376;hp=b8dca1a0fad15b68e260871f3cc15629a11b0112;hpb=274f82d750eb0661b6336b87a8e21167615957af;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index b8dca1a0f..fab4520fa 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -27,18 +27,26 @@ 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 {
+			if $::hostname in [lobos,villa] {
+				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
+				}
+			} else {
+				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 --no-battery
+						| EOF
+				}
+			}
 		}
+		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
 		site::aptrepo { 'debian.restricted':
 			ensure => absent,