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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7b1af9a5..ace4f63b 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
@@ -93,6 +91,9 @@ 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