make czerny a ganeti-node

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 593be680be55db2c9dfe30b20012faf539f6ee2f..b9382e2606f90e215466b0c42918bd5faffce49a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,41 +34,54 @@ node default {
        include nagios::client
        include resolv
        include roles
+       include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny] {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
+       }
+
+       if $::hostname == 'beethoven' {
+               include bacula::storage
+       }
+
        if $::kernel == Linux {
                include linux
+               if $::kvmdomain {
+                       include acpi
+               }
        } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
-       if $::kvmdomain {
-               include acpi
-       }
-
        if $::mta == 'exim4' {
                if getfromhash($site::nodeinfo, 'heavy_exim') {
                        include exim::mx
                } else {
                        include exim
                }
-       } else {
+       } elsif $::mta == 'postfix' {
                include postfix
+       } else {
+               include exim
        }
 
-       include unbound
-
        if $::apache2 {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
        if $::hostname in [ravel,senfl,orff,draghi,diamond] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {
@@ -79,10 +92,14 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
+       if $::hostname == 'vieuxtemps' {
+               include varnish
+       }
+
        if $::brokenhosts {
                include hosts
        }
@@ -97,11 +114,17 @@ node default {
                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
+               }
+       }
 }