some cleanup of bacula classes

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d81f6af53f8fed98284425522906b99c07e..a504ecbc1b84cc32eb1c9e7a0e45e47da4a51c09 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -36,12 +36,21 @@ node default {
        include roles
        include unbound
 
-       if $::hostname in [pasquini,tristano] {
+       if $::hostname in [pasquini,tristano,bertali,boito] {
                include ganeti2
        }
 
        if $::hostname == 'dinis' {
-               include bacula-director
+               include bacula::director
+       }
+
+       if $::hostname in [berlioz, biber, draghi] {
+               include bacula::client
+               @@bacula::node { $::fqdn: }
+       }
+
+       if $::hostname == 'beethoven' {
+               include bacula::storage
        }
 
        if $::kernel == Linux {
@@ -79,7 +88,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,duarte,spohr,stabile] {
+       if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
                include nfs-server
        }