X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=dfed0cde3a6e821f7a5614b8092c8f810d561439;hb=3bb82b6a3e928d084e16e6131548214894453196;hp=66d34645a09288dc613b489881aff090a3f9409d;hpb=ebb13e37cad60c5e62c351b004f311d2d32d5bda;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 66d34645a..dfed0cde3 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -72,10 +72,6 @@ multipaths {
 		wwid	3600c0ff000d5ad347a49665401000000
 		alias	dillon
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d83a70ac13965601000000
 		alias	dillon-lvm2
@@ -96,14 +92,6 @@ multipaths {
 		wwid	3600c0ff000d5ad346a00655401000000
 		alias	donizetti-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34f780675401000000
-		alias	fede
-	}
-	multipath {
-		wwid	3600c0ff000d5ad341781675401000000
-		alias	fede-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad348670635401000000
 		alias	gideon
@@ -112,14 +100,6 @@ multipaths {
 		wwid	3600c0ff000d5ad348d70635401000000
 		alias	gideon-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d75b58ed4d215701000000
-		alias	httpredir-bm-01-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -149,32 +129,20 @@ multipaths {
 		alias	mekeel
 	}
 	multipath {
-		wwid	3600c0ff000d5ad341ca4655401000000
-		alias	milanollo
+		wwid	3600c0ff000d5ad341b39685c01000000
+		alias	mekeel-srv
 	}
 	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
+		wwid	3600c0ff000d5ad341ca4655401000000
+		alias	milanollo
 	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
 	}
 	multipath {
-		wwid	3600c0ff000d5ad3454b3655401000000
-		alias	moszumanska
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34951e635401000000
-		alias	moszumanska-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
+		wwid	3600c0ff000d83a707ec2985701000000
+		alias	olin
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
@@ -210,10 +178,18 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad348f67675401000000
-		alias	picconi
+		alias	OLD-picconi
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34de57675401000000
+		alias	OLD-picconi-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d83a709ddc705801000000
+		alias	picconi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70addc705801000000
 		alias	picconi-lvm
 	}
 	multipath {
@@ -240,6 +216,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
 		alias	rusca
@@ -256,6 +240,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -284,12 +272,4 @@ multipaths {
 		wwid	3600c0ff000d5ad340ad9635401000000
 		alias	wuiet-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3442f4645401000000
-		alias	x86-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d5ad344af4645401000000
-		alias	x86-bm-01-lvm
-	}
 }