Merge remote-tracking branch 'origin/master' into staging

[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 a0ab33c..0360087 100644 (file)
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -28,11 +28,18 @@ class hardware::raid::proliant {
                }
 
                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 dsa-check-hpssacli
+                               content  => @("EOF")
+                                       27 */2 * * * root sleep $(( RANDOM \% 900 )); dsa-wrap-nagios-check ${cmd}
                                        | EOF
                        }
                }