X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=78c5422a73342c5bc54d77fe442641585600dc21;hb=refs%2Fheads%2Fsalsa;hp=a0ab33c74dbec9115e6f2072451897683e639ae3;hpb=05bfa391748bf827189c42c1a79694ca4cef28c3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index a0ab33c74..78c5422a7 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,10 +1,9 @@
 class hardware::raid::proliant {
 	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
-		site::aptrepo { 'debian.restricted':
-			url        => 'http://db.debian.org/debian-admin',
-			suite      => "${::lsbdistcodename}-restricted",
-			components => 'non-free',
+		base::aptrepo { 'debian.restricted':
+			ensure => absent,
 		}
+		include debian_org::apt_restricted
 
 		package { 'hpacucli':
 			ensure  => installed,
@@ -28,17 +27,24 @@ class hardware::raid::proliant {
 		}
 
 		if $::smartarraycontroller_hpsa {
-			concat::fragment { 'dsa-puppet-stuff--nagios--dsa-check-hpssacli':
-				target => '/etc/cron.d/dsa-puppet-stuff',
+			$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 { 'puppet-crontab--nagios--dsa-check-hpssacli':
+				target => '/etc/cron.d/puppet-crontab',
 				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
 			}
 		}
 		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
-		site::aptrepo { 'debian.restricted':
+		base::aptrepo { 'debian.restricted':
 			ensure => absent,
 		}
 	}