Always remove acpi packages from jessie hosts

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 76917a3f72c3440efcd2c287663971c9603bcf5f..5b95b0c63d9e4e7053f1800d6f0a46e852444eb0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,6 +38,7 @@ node default {
        include bacula::client
        include autofs
        include lvm
+       include grub
        include multipath
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
@@ -70,9 +71,7 @@ node default {
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
@@ -119,7 +118,7 @@ node default {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [chopin,geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -137,3 +136,4 @@ node default {
                }
        }
 }
+