add lldp to ynic hosts

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

diff --git a/manifests/site.pp b/manifests/site.pp
index acde9e3992568a7a9c28fe5d06e114c0fb57a42d..41d88df462434ab0159fc9b46632598d65d601d0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,11 +35,28 @@ node default {
        include resolv
        include roles
        include unbound
+       include bacula::client
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
                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 {
@@ -55,18 +72,16 @@ node default {
                } else {
                        include exim
                }
-       } else {
+       } elsif $::mta == 'postfix' {
                include postfix
+       } else {
+               include exim
        }
 
        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] {
@@ -77,7 +92,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,spohr,stabile,beach] {
                include nfs-server
        }
 
@@ -95,11 +110,15 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+       if $::hoster in [ynic] {
+               include lldp
+       }
 }