From: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu, 1 Feb 2018 23:51:23 +0000 (+0100)
Subject: lobos and villa do not have a battery on their raid controller
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6b572a9cba8d72b99d1a9b56d226c8d405c40376;p=mirror%2Fdsa-puppet.git

lobos and villa do not have a battery on their raid controller

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index a0ab33c74..fab4520fa 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -28,12 +28,22 @@ class hardware::raid::proliant {
 		}
 
 		if $::smartarraycontroller_hpsa {
-			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
-					| EOF
+			if $::hostname in [lobos,villa] {
+				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
+						| EOF
+				}
+			} else {
+				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 --no-battery
+						| EOF
+				}
 			}
 		}
 		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }