X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ab6fd7dc66a8265d5a0c54883a4fd1e6a073161a;hb=f66bb1737890b64acd529dfc23e8fd8e5b7d59bf;hp=6461585b34f3d6d24ac6e8a4e8a8016dd3ec5a6d;hpb=23b709cd5502305b328e3487c1a48042bf7d98fa;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6461585b3..ab6fd7dc6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,14 +37,13 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
+	include lvm
+	include multipath
 
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,dijkstra,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] {
-		include multipath
-	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
@@ -58,7 +57,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -87,17 +86,20 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
+	if $::hostname in [ravel,senfl,orff,diamond,rietz,denis] {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
+	if $::hostname in [orff, denis] {
+		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
 	}