Merge mptcontroller and mptraid facts

[dsa-puppet.git] / facts / raidarray.rb

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 35a4126f812fb46b3c1235a0e946a7f0657dd67d..592f006cf4d50c4f2610c8c93590b7964cfc9b28 100644 (file)
--- 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