From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 28 Feb 2010 16:17:51 +0000 (+0100)
Subject: Merge mptcontroller and mptraid facts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c364b2ebb3b3cc84e729f92b4f9fd0cb80650a0b;p=mirror%2Fdsa-puppet.git

Merge mptcontroller and mptraid facts
---

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 35a4126f8..592f006cf 100644
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -5,13 +5,6 @@ Facter.add("smartarraycontroller") do
 	end
 end
 
-Facter.add("mptcontroller") do
-	confine :kernel => :linux
-	setcode do
-		FileTest.exist?("/proc/mpt/summary")
-	end
-end
-
 Facter.add("ThreeWarecontroller") do
 	confine :kernel => :linux
 	setcode do
@@ -34,7 +27,7 @@ end
 
 Facter.add("mptraid") do
 	setcode do
-		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt9")
+		FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt9") or FileTest.exist?("/proc/mpt/summary")
 	end
 end