Always remove acpi packages from jessie hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7bfca473e899e55384e32257b7ba3cff53585b85..5b95b0c63d9e4e7053f1800d6f0a46e852444eb0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,13 +38,21 @@ node default {
        include bacula::client
        include autofs
        include lvm
+       include grub
        include multipath
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
+       }
 
-       if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
+       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
        }
 
-
        if $::hostname == 'dinis' {
                include bacula::director
        } else {
@@ -57,15 +65,13 @@ node default {
                }
        }
 
-       if $::hostname == 'backuphost' {
+       if $::hostname == 'storace' {
                include bacula::storage
        }
 
        if $::kernel == Linux {
                include linux
-               if $::kvmdomain {
-                       include acpi
-               }
+               include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
@@ -83,30 +89,23 @@ node default {
        }
 
        if $::apache2 {
-               include apache2
+               if !($::hostname in [oyens]) {
+                       include apache2
+               }
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
-       if $::hostname in [orff, denis] {
-               include dnsextras::entries
-       }
 
-       if $::hostname in [diabelli,nono] {
-               include dacs
-       }
+       #if $::hostname in [diabelli,nono,tchaikovsky] {
+       #       include dacs
+       #}
 
-       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
+       if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
                include nfs-server
        }
 
-       if $::hostname == 'vieuxtemps' {
-               include varnish
-       }
-
        if $::brokenhosts {
                include hosts
        }
@@ -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 {
                }
        }
 }
+