Always remove acpi packages from jessie hosts

diff --git a/manifests/site.pp b/manifests/site.pp
index 3ccacfe0b76384534e76921fb5b41f77c9d50582..5b95b0c63d9e4e7053f1800d6f0a46e852444eb0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -71,9 +71,7 @@ node default {
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index 91aceaf0850ed9e5bf19c8f7d57b7d6f417c7e31..feadbe356f85bd8d840dcd34974968facb187a69 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -8,7 +8,7 @@ class acpi {
                        package { 'acpi-support-base':
                                ensure => purged
                        }
-               } else {
+               } elsif ($::kvmdomain) {
                        package { 'acpid':
                                ensure => installed
                        }