more cleanup

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

diff --git a/manifests/site.pp b/manifests/site.pp
index b4f44c26e379cf9e90a692a4e77820b9f0c82578..3bf505cecf3bae4b3780b2893c8b08a57c794a62 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,7 +35,7 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    if $::smartarraycontroller {
+    if $::smartarraycontroller == 'true' {
         include debian-proliant
     }
 
@@ -43,11 +43,11 @@ node default {
         include megactl
     }
 
-    if $::mptraid {
+    if $::mptraid == 'true' {
         include raidmpt
     }
 
-    if $::kvmdomain {
+    if $::kvmdomain == 'true' {
         include acpi
     }
 
@@ -71,7 +71,7 @@ node default {
         default: { include nagios::client }
     }
 
-    if $::apache2 {
+    if $::apache2 == 'true' {
          if getfromhash($nodeinfo, 'apache2_security_mirror') {
                 include apache2::security_mirror
          }
@@ -87,7 +87,7 @@ node default {
          include apache2
     }
 
-    if $::rsyncd {
+    if $::rsyncd == 'true' {
         include rsyncd-log
     }
 
@@ -127,11 +127,11 @@ node default {
         }
     }
 
-    if $::brokenhosts {
+    if $::brokenhosts == 'true' {
         include hosts
     }
 
-    if $::portforwarder_user_exists {
+    if $::portforwarder_user_exists == 'true' {
         include portforwarder
     }
 

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index af961ba0308d931a0abd3ca13a7a4aaa14472d04..ffc779b8dd106427c84ed58a991760e9e2240f0c 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,5 +1,5 @@
 class acpi {
-    if ! $debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'] {
+    if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
         package {
             acpid: ensure => installed
         }

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index a5717e15d4b3dbf76f4d87142b0d0c8ec23a8a12..374da37228803e3c7bd8a658ebefd5b20e85552f 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -244,7 +244,7 @@ class ferm::per-host {
         }
     }
 
-    if $::rsyncd {
+    if $::rsyncd == 'true' {
         include ferm::rsync
     }
 }