Always remove acpi packages from jessie hosts

[dsa-puppet.git] / modules / acpi / manifests / init.pp

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index c427cb99bf7d40492b5cbab3595ecfed0d255885..feadbe356f85bd8d840dcd34974968facb187a69 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,10 +1,23 @@
 class acpi {
        if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-               package { 'acpid':
-                       ensure => installed
-               }
+               if ($::lsbmajdistrelease >= 8) {
+                       package { 'acpid':
+                               ensure => purged
+                       }
+
+                       package { 'acpi-support-base':
+                               ensure => purged
+                       }
+               } elsif ($::kvmdomain) {
+                       package { 'acpid':
+                               ensure => installed
+                       }
+
+                       service { 'acpid':
+                               ensure  => running,
+                               require => Package['acpid'],
+                       }
 
-               if $::lsbdistcodename != 'lenny' {
                        package { 'acpi-support-base':
                                ensure => installed
                        }