Try to use booleans instead of strings - this can't possibly go wrong

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/facts/raidcontroller.rb b/facts/raidcontroller.rb
index 263b16b24f95d3b11fbf6372b15c1ee83f2b90d1..12d140fd078ae57347a77146c0befcf0fc0fa9ff 100644 (file)
--- a/facts/raidcontroller.rb
+++ b/facts/raidcontroller.rb
@@ -9,7 +9,7 @@ Facter.add("smartarraycontroller") do
                                ishp = "true" if s =~ /RAID bus controller: (.*) Smart Array/
                        }
                end
-               ishp
+               ishp == "true"
        end
 end
 
@@ -29,7 +29,7 @@ Facter.add("3warecontroller") do
                                is3w = "true" if x =~ /Vendor: 3ware/
                        }
                end
-               is3w
+               is3w == "true"
        end
 end
 
@@ -42,7 +42,7 @@ Facter.add("swraid") do
                                 swraid = "true" if x =~ /md[0-9]+ : active/
                         }
                 end
-                swraid
+                swraid == "true"
        end
 end
 

diff --git a/manifests/site.pp b/manifests/site.pp
index 4758621b37100d6c563b2e8b0980c91d3642d215..6b5f001e54c913e8f28cf3f2d72a8ad36b799a31 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -7,9 +7,8 @@ node default {
     include samhain
     include debian-org
 
-    case $smartarraycontroller {
-        "true":    { include debian-proliant }
-        default: {}
+    if $smartarraycontroller {
+        include debian-proliant
     }
     case $mta {
         "exim4":   { include exim }