X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=8a09872c7533aa016b42a1ce634db6e018d0e936;hb=468d00478388aea379f1f8dbf9f6e8da8df67afb;hp=1db00d81f6af53f8fed98284425522906b99c07e;hpb=2e3464fa1aa11ebb2586271246c8d586c56d44cc;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d81f..8a09872c7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,13 +35,18 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
 		include ganeti2
 	}
 
 	if $::hostname == 'dinis' {
-		include bacula-director
+		include bacula::director
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
 	}
 
 	if $::kernel == Linux {
@@ -79,7 +84,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -101,6 +106,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}