X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ff7d3cd722cd3459bb2a74e45e591e87e73b403a;hb=54b3cfe88cd6e52e3029df1a11595dafdb016ae5;hp=7b1af9a57f2798da954d0d1735cf3c01ff62034d;hpb=f7d9c31205ea2231f0fa60072f4e90800455c5c9;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 7b1af9a57..ff7d3cd72 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,14 +38,12 @@ node default {
 	include bacula::client
 	include autofs
 	include lvm
+	include multipath
 
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
+	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
 		include ganeti2
 	}
 
-	if $::hostname in [bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,rossini,luchesi,dijkstra] {
-		include multipath
-	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
@@ -59,7 +57,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -93,12 +91,15 @@ node default {
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
+	if $::hostname in [orff] {
+		include dnsextras::entries
+	}
 
-	if $::hostname in [diabelli,nono,spohr] {
+	if $::hostname in [diabelli,nono] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server
 	}