diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 13:43:16 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-31 13:43:16 -0300 |
| commit | 261bb2139bba1d7b8be21776b9c06ba1fa241582 (patch) | |
| tree | 0ae62f2690bee53a644425d83a7536604928dfc8 | |
| parent | 20fe7a78717cb186661d27cb72ce0bf7272161d6 (diff) | |
| download | puppet-nodo-261bb2139bba1d7b8be21776b9c06ba1fa241582.tar.gz puppet-nodo-261bb2139bba1d7b8be21776b9c06ba1fa241582.tar.bz2 | |
Do not wrap apcupsd inclusion
| -rw-r--r-- | manifests/base/physical.pp | 3 | ||||
| -rw-r--r-- | manifests/subsystem/ups.pp | 28 |
2 files changed, 1 insertions, 30 deletions
diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp index 60a506b..f533188 100644 --- 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 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, - } - } - } -} |