Do not wrap apcupsd inclusion

diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp
index 60a506b1fbc5640f7ee939469fa796be85eac4a3..f533188632e77a35f9d84fb2beb47314b921b56a 100644 (file)
--- a/manifests/base/physical.pp
+++ b/manifests/base/physical.pp
@@ -1,7 +1,6 @@
 class nodo::base::physical inherits nodo::base::host {
-  class { 'nodo::subsystem::ups': }
-
   $smartmontools = hiera('nodo::smartmontools', true)
+
   if $smartmontools == true {
     class { 'smartmontools': }
   }

diff --git a/manifests/subsystem/ups.pp b/manifests/subsystem/ups.pp
deleted file mode 100644 (file)
index 987aadf..0000000
--- a/manifests/subsystem/ups.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class nodo::subsystem::ups(
-    $include        = hiera('nodo::subsystem::ups::include',        false),
-    $ensure         = hiera('nodo::subsystem::ups::ensure',         'present'),
-    $type           = hiera('nodo::subsystem::ups::type',           'usb'),
-    $cable          = hiera('nodo::subsystem::ups::cable',          'usb'),
-    $dev            = hiera('nodo::subsystem::ups::dev',            '/dev/usb/hiddev0'),
-    $nisip          = hiera('nodo::subsystem::ups::nisip',          '127.0.0.1'),
-    $polltime       = hiera('nodo::subsystem::ups::polltime',       '60'),
-    $onbatterydelay = hiera('nodo::subsystem::ups::onbatterydelay', '6'),
-    $batterylevel   = hiera('nodo::subsystem::ups::batterylevel',   '5'),
-    $minutes        = hiera('nodo::subsystem::ups::minutes',        '3'),
-) {
-  case $include {
-    true: {
-      class { "apcupsd":
-        upstype        => $type,
-        cable          => $cable,
-        device         => $dev,
-        nisip          => $nisip,
-        polltime       => $polltime,
-        onbatterydelay => $onbatterydelay,
-        batterylevel   => $batterylevel,
-        minutes        => $minutes,
-        ensure         => $ensure,
-      }
-    }
-  }
-}