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

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index d926e19cd..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,
@@ -27,20 +26,25 @@ class hardware::raid::proliant {
 			}
 		}
 
-		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
+		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 { '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 ${cmd}
+					| EOF
+			}
 		}
+		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
-		site::aptrepo { 'debian.restricted':
+		base::aptrepo { 'debian.restricted':
 			ensure => absent,
 		}
 	}