X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=f877cf5b8b138299a1f6528f9ad91c3c3a48c5a7;hb=9768916cd03adff997b5306ed0497c31d30f2624;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..f877cf5b8 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,17 +27,17 @@ class hardware::raid::proliant {
 			}
 		}
 
+		if $::smartarraycontroller_hpsa {
+			concat::fragment { 'dsa-check-hpssacli':
+				target => '/etc/cron.d/puppet-nagios-wraps',
+				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 => ($::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
-
+			ensure => absent,
 		}
 	} else {
 		site::aptrepo { 'debian.restricted':