X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=84189ce153cc9f6567f688614093bfc060804a1e;hb=ce185de85e44360d9b734b0a4e78c2aa86a8aaa8;hp=96507165e712e032232de21bd49d66ace3fd4d36;hpb=70fd1d0c0552c4720546b55697db06032019e707;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 96507165e..84189ce15 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -48,6 +48,10 @@ multipaths {
 		wwid	3600c0ff000d5ad346dea825601000000
 		alias	bmdb1-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a70d912965601000000
+		alias	bmdb1-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f874635401000000
 		alias	coccia
@@ -69,8 +73,8 @@ multipaths {
 		alias	dillon
 	}
 	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
+		wwid	3600c0ff000d83a70ac13965601000000
+		alias	dillon-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3421c3635401000000
@@ -88,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
@@ -104,10 +100,6 @@ multipaths {
 		wwid	3600c0ff000d5ad348d70635401000000
 		alias	gideon-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -124,6 +116,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e86a635401000000
 		alias	lindsay-srv
 	}
+	multipath {
+		wwid	3600c0ff000d83a70921c115701000000
+		alias	manziarly
+	}
+	multipath {
+		wwid	3600c0ff000d83a709d1c115701000000
+		alias	manziarly-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
@@ -132,10 +132,6 @@ multipaths {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
-	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
@@ -149,12 +145,8 @@ multipaths {
 		alias	moszumanska-lvm
 	}
 	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
+		wwid	3600c0ff000d83a707ec2985701000000
+		alias	olin
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
@@ -190,19 +182,19 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad348f67675401000000
-		alias	picconi
+		alias	OLD-picconi
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34de57675401000000
-		alias	picconi-lvm
+		alias	OLD-picconi-lvm
 	}
 	multipath {
-		wwid	3600c0ff000d5ad346501705501000000
-		alias	pittar
+		wwid	3600c0ff000d83a709ddc705801000000
+		alias	picconi
 	}
 	multipath {
-		wwid	3600c0ff000d5ad347c01705501000000
-		alias	pittar-lvm
+		wwid	3600c0ff000d83a70addc705801000000
+		alias	picconi-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad345cee645401000000
@@ -212,14 +204,6 @@ multipaths {
 		wwid	3600c0ff000d5ad3465ee645401000000
 		alias	piu-slave-bm-a-swap
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34c6ae6b5401000000
-		alias	portman
-	}
-	multipath {
-		wwid	3600c0ff000d5ad341e9d6b5401000000
-		alias	portman-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34fa5d6a5401000000
 		alias	quantz
@@ -236,6 +220,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
 		alias	rusca
@@ -252,6 +244,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -260,6 +256,10 @@ multipaths {
 		wwid	3600c0ff000d75b58264c825401000000
 		alias	sor-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a703b2dae5601000000
+		alias	tate
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
 		alias	ticharich