From 97bb59312bddfa861db8b588a94df270320b28c1 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 Aug 2017 14:37:59 +0200
Subject: [PATCH 1/1] Migrate /etc/cron.d/puppet-nagios-hpsa to the
 puppet-nagios-wraps concat

---
 modules/hardware/manifests/raid/proliant.pp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index d926e19cd..9f9114e8c 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -27,17 +27,16 @@ class hardware::raid::proliant {
 			}
 		}
 
+		if $::smartarraycontroller_hpsa {
+			concat::fragment { 'dsa-check-hpssacli':
+				target => '/etc/cron.d/puppet-nagios-wraps',
+				content  => @(EOF)
+					27 * * * * 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 */2 * * 0 root sleep $(( $RANDOM \% 900 )); dsa-wrap-nagios-check dsa-check-hpssacli
-				| EOF
-
+			ensure => absent,
 		}
 	} else {
 		site::aptrepo { 'debian.restricted':
-- 
2.20.1