X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ace4f63b3a37b8a98733a6b43de1d17915c276ff;hb=108cf6c59c96238bc76eb2150632e21c2c6d3e26;hp=bab825db410b304cb1371a1b1bf693774f56143e;hpb=ab2ed88279650106f252798cf1c6ba9b5ddc005b;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index bab825db..ace4f63b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,21 +29,21 @@ node default {
 	include ntp
 	include ntpdate
 	include ssl
-	include motd
 	include hardware
 	include nagios::client
 	include resolv
 	include roles
+	include motd
 	include unbound
 	include bacula::client
+	include autofs
+	include lvm
+	include multipath
 
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny,rossini,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] {
-		include multipath
-	}
 
 	if $::hostname == 'dinis' {
 		include bacula::director
@@ -91,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] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach,glinka] {
+	if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
 		include nfs-server
 	}