X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8e4a77ac332759f66c66d6608d4892c68c1a3a1b;hb=0b2a09d5a5ad6f685e1d091b497e9a349c25f3d4;hp=94ec40dd9f8557cc3a1e766cd6e20f0759a0cf1e;hpb=adbed0cb345317e72e56f4154a447a3798ce4c0a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 94ec40dd9..8e4a77ac3 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,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