X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;fp=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=0360087241353c319f4ef80a9eeaf096725047c7;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=a0ab33c74dbec9115e6f2072451897683e639ae3;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index a0ab33c74..036008724 100644
--- 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
 			}
 		}