]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
try to make these booleans
authorStephen Gran <steve@lobefin.net>
Sun, 18 Mar 2012 15:52:32 +0000 (15:52 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 18 Mar 2012 15:52:32 +0000 (15:52 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/debian-org/lib/facter/hosts.rb
modules/debian-org/lib/facter/raidarray.rb
modules/debian-org/lib/facter/servertype.rb

index b55c43b1a2546dbc46617459b320714a3ffc9d00..2a6b692a2ac439046e6aef77742b3d6ab0f0266b 100644 (file)
@@ -1,17 +1,17 @@
 Facter.add("brokenhosts") do
-       brokenhosts = "true"
+       brokenhosts = true
        if FileTest.exist?("/etc/hosts")
                IO.foreach("/etc/hosts") do |x|
                        x.split.each do |y|
                                if y == Facter.value("fqdn")
-                                       brokenhosts = "false"
+                                       brokenhosts = false
                                        break
                                end
                        end
                end
        end
        setcode do
-               brokenhosts == "true"
+               brokenhosts
        end
 end
 
index 28fdca489a859c37feae97cf19b63983af8d2670..be4bbad195eb0cb69d7a7f014a15ca02a7ff777d 100644 (file)
@@ -8,13 +8,13 @@ end
 Facter.add("ThreeWarecontroller") do
        confine :kernel => :linux
        setcode do
-               is3w = "false"
+               is3w = false
                if FileTest.exist?("/proc/scsi/scsi")
                        IO.foreach("/proc/scsi/scsi") { |x|
                                is3w = "true" if x =~ /Vendor: 3ware/
                        }
                end
-               is3w == "true"
+               is3w
        end
 end
 
@@ -42,13 +42,13 @@ end
 Facter.add("swraid") do
        confine :kernel => :linux
        setcode do
-                swraid = "false"
+                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"
+                swraid
        end
 end
 
index fa2f35ed670cf2e7e5b97ca58aaa4cbecc6bbfc1..e261e709a4195ebc215243fa9bc05b6d956db817 100644 (file)
@@ -5,5 +5,6 @@ Facter.add("kvmdomain") do
                else
                        result = false
                end
+               result
        end
 end