X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fproliant.pp;h=a0ab33c74dbec9115e6f2072451897683e639ae3;hb=d7dff70424dc48067cd223e3bf92e54bb973afbf;hp=a19ec2849f2153f9fda6812bcfb57f174b24c828;hpb=6b3f2197570ae91174b38c04329414c5166c8d05;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/proliant.pp b/modules/hardware/manifests/raid/proliant.pp
index a19ec2849..a0ab33c74 100644
--- a/modules/hardware/manifests/raid/proliant.pp
+++ b/modules/hardware/manifests/raid/proliant.pp
@@ -1,5 +1,5 @@
 class hardware::raid::proliant {
-	if $::smartarraycontroller {
+	if $::smartarraycontroller_hpsa or $::smartarraycontroller_cciss {
 		site::aptrepo { 'debian.restricted':
 			url        => 'http://db.debian.org/debian-admin',
 			suite      => "${::lsbdistcodename}-restricted",
@@ -26,6 +26,17 @@ class hardware::raid::proliant {
 				ensure => installed,
 			}
 		}
+
+		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
+			}
+		}
+		file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
 	} else {
 		site::aptrepo { 'debian.restricted':
 			ensure => absent,