X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fhardware%2Fmanifests%2Fraid.pp;h=1dac055b6b5ab0ab83f3bf6a922b2e7cbe05f877;hb=e3b8a5e4eae28e96b6d955b4be408f8510e49c52;hp=3affb8983de009ecaf28943a06c9ab29ba71b12a;hpb=40ccbb8afd9beaa8f41ee20d19aabe13dcd4f509;p=mirror%2Fdsa-puppet.git

diff --git a/modules/hardware/manifests/raid.pp b/modules/hardware/manifests/raid.pp
index 3affb8983..1dac055b6 100644
--- a/modules/hardware/manifests/raid.pp
+++ b/modules/hardware/manifests/raid.pp
@@ -1,14 +1,10 @@
 class hardware::raid {
-	if $::smartarraycontroller {
-		include hardware::raid::proliant
-	}
-
-	if $::productname == 'PowerEdge 2850' {
-		include hardware::raid::megactl
-	}
+	include hardware::raid::proliant
 
-	if $::mptraid {
-		include hardware::raid::raidmpt
+	if $::productname == 'PowerEdge 1950' {
+		include hardware::raid::dell
 	}
 
+	include hardware::raid::raidmpt
+	include hardware::raid::megaraid_sas
 }