Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  add fact for megaraid controllers
  strip some of the randomness

diff --git a/facts/architecture.rb b/facts/architecture.rb
index f0d7ff5..894c82c 100644 (file)
--- a/facts/architecture.rb
+++ b/facts/architecture.rb
@@ -13,7 +13,7 @@ end
 
 Facter.add(:debarchitecture) do
     setcode do
-        %x{/usr/bin/dpkg --print-architecture}
+        %x{/usr/bin/dpkg --print-architecture}.chomp
     end
 end
 

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index acd46b8..61e48b6 100644 (file)
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -25,6 +25,13 @@ Facter.add("ThreeWarecontroller") do
        end
 end
 
+Facter.add("megaraid") do
+       confine :kernel => :linux
+       setcode do
+               FileTest.exist?("/dev/megadev0")
+       end
+end
+
 Facter.add("aacraid") do
        confine :kernel => :linux
        setcode do