Migrate /etc/cron.d/puppet-nagios-hpsa to the puppet-nagios-wraps concat

[mirror/dsa-puppet.git] / modules / hardware / manifests / raid / proliant.pp

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index d926e19..9f9114e 100644 (file)
--- 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':