Always remove acpi packages from jessie hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c1089a87d9ad4594659f6f71add68b0a27fae51b..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
@@ -48,7 +49,7 @@ node default {
                }
        }
 
-       if $::hostname in [pasquini,tristano,ubc-bl2,boito,ubc-bl8,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
                include ganeti2
        }
 
@@ -70,9 +71,7 @@ node default {
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
@@ -90,7 +89,9 @@ node default {
        }
 
        if $::apache2 {
-               include apache2
+               if !($::hostname in [oyens]) {
+                       include apache2
+               }
        }
 
        if $::hostname in [geo1,geo2,geo3] {
@@ -117,7 +118,7 @@ node default {
                include samhain
        }
 
-       if $::hostname in [chopin,geo3,soler,wieck] {
+       if $::hostname in [chopin,geo3,wieck] {
                include debian-org::radvd
        }
 
@@ -135,3 +136,4 @@ node default {
                }
        }
 }
+