From: Stephen Gran <steve@lobefin.net>
Date: Fri, 24 Jul 2009 13:25:02 +0000 (+0100)
Subject: Will this fix it?  Who knows?  Who understands the mystery of the puppet?
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=599ec048ea56641809249167dc45b7cefaac8c34;p=mirror%2Fdsa-puppet.git

Will this fix it?  Who knows?  Who understands the mystery of the puppet?
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
new file mode 100644
index 000000000..8a09a71ca
--- /dev/null
+++ b/facts/raidarray.rb
@@ -0,0 +1,48 @@
+Facter.add("smartarraycontroller") do
+	confine :kernel => :linux
+	ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
+	setcode do
+		ishp = "false"
+		lspciexists = system "/bin/bash -c 'which lspci >&/dev//null'"
+		if $?.exitstatus == 0
+			%x{lspci 2>&1}.each { |s|
+				ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
+			}
+		end
+		ishp == "true"
+	end
+end
+
+Facter.add("mptcontroller") do
+	confine :kernel => :linux
+	setcode do
+		FileTest.exist?("/proc/mpt/summary")
+	end
+end
+
+Facter.add("3warecontroller") do
+	confine :kernel => :linux
+	setcode do
+		is3w = "false"
+		if FileTest.exist?("/proc/scsi/scsi")
+			IO.foreach("/proc/scsi/scsi") { |x|
+				is3w = "true" if x =~ /Vendor: 3ware/
+			}
+		end
+		is3w == "true"
+	end
+end
+
+Facter.add("swraid") do
+	confine :kernel => :linux
+	setcode do
+                swraid = "false"
+		if FileTest.exist?("/proc/mdstat") && FileTest.exist?("/sbin/mdadm")
+                        IO.foreach("/proc/mdstat") { |x|
+                                swraid = "true" if x =~ /md[0-9]+ : active/
+                        }
+                end
+                swraid == "true"
+	end
+end
+
diff --git a/facts/raidcontroller.rb b/facts/raidcontroller.rb
deleted file mode 100644
index 8a09a71ca..000000000
--- a/facts/raidcontroller.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-Facter.add("smartarraycontroller") do
-	confine :kernel => :linux
-	ENV["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
-	setcode do
-		ishp = "false"
-		lspciexists = system "/bin/bash -c 'which lspci >&/dev//null'"
-		if $?.exitstatus == 0
-			%x{lspci 2>&1}.each { |s|
-				ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
-			}
-		end
-		ishp == "true"
-	end
-end
-
-Facter.add("mptcontroller") do
-	confine :kernel => :linux
-	setcode do
-		FileTest.exist?("/proc/mpt/summary")
-	end
-end
-
-Facter.add("3warecontroller") do
-	confine :kernel => :linux
-	setcode do
-		is3w = "false"
-		if FileTest.exist?("/proc/scsi/scsi")
-			IO.foreach("/proc/scsi/scsi") { |x|
-				is3w = "true" if x =~ /Vendor: 3ware/
-			}
-		end
-		is3w == "true"
-	end
-end
-
-Facter.add("swraid") do
-	confine :kernel => :linux
-	setcode do
-                swraid = "false"
-		if FileTest.exist?("/proc/mdstat") && FileTest.exist?("/sbin/mdadm")
-                        IO.foreach("/proc/mdstat") { |x|
-                                swraid = "true" if x =~ /md[0-9]+ : active/
-                        }
-                end
-                swraid == "true"
-	end
-end
-