X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid%2Fraidmpt.pp;h=44cb03eedbe45e1968e894b34d5a1d1205181148;hb=180bb8abadf2700329bbb94ba78e87d1bc538b22;hp=f371c7227a4f4d9623a4193266a0009d009b9909;hpb=9e1f74ad62a130347719115d4248d0dc1170d0c2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid/raidmpt.pp b/modules/hardware/manifests/raid/raidmpt.pp
index f371c7227..44cb03eed 100644
--- a/modules/hardware/manifests/raid/raidmpt.pp
+++ b/modules/hardware/manifests/raid/raidmpt.pp
@@ -7,27 +7,11 @@
 #   include hardware::raid::raidmpt
 #
 class hardware::raid::raidmpt {
-	if $::mptraid {
-		package { 'mpt-status':
-			ensure => installed
-		}
-
-		file { '/etc/default/mpt-statusd':
-			content => "# This file is under puppet control\nRUN_DAEMON=no\n",
-			notify  => Exec['mpt-statusd-stop'],
-		}
-
-		exec { 'mpt-statusd-stop':
-			command => 'pidfile=/var/run/mpt-statusd.pid; ! [ -e "$pidfile" ] || /sbin/start-stop-daemon --oknodo --stop --signal TERM --quiet --pidfile "$pidfile"; rm -f "$pidfile";  pkill -INT  -P 1 -u 0 -f "/usr/bin/daemon /etc/init.d/mpt-statusd check_mpt"',
-			refreshonly => true,
-		}
-	} else {
-		package { 'mpt-status':
-			ensure => purged,
-		}
+	package { 'mpt-status':
+		ensure => purged,
+	}
 
-		file { '/etc/default/mpt-statusd':
-			ensure => absent,
-		}
+	file { '/etc/default/mpt-statusd':
+		ensure => absent,
 	}
 }