make rossini a ganeti cluster node

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 775c6a1752a37c9c902f1ed15891998ad5121b11..8ef2c6c087583a25fef6408f26ae4895d66ae1de 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,17 +35,22 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini] {
                include ganeti2
        }
 
        if $::hostname == 'dinis' {
                include bacula::director
-       }
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
 
-       if $::hostname in [berlioz, biber, draghi, widor, wolkenstein] {
-               include bacula::client
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {
@@ -77,7 +82,7 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
                include named::geodns
@@ -91,6 +96,10 @@ node default {
                include nfs-server
        }
 
+       if $::hostname == 'vieuxtemps' {
+               include varnish
+       }
+
        if $::brokenhosts {
                include hosts
        }
@@ -99,17 +108,25 @@ node default {
                include portforwarder
        }
 
-       include samhain
+       if $::samhain {
+               include samhain
+       }
 
        if $::hostname in [chopin,geo3,soler,wieck] {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+       if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
+       }
 }