X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=ae7551f49c00a88b7a88ca9ebcc72f950db612a2;hb=7078770bf6bf50fecb8dac96388fbecaa93a8e9f;hp=23cdbcb72f56f650fd898b414c4cd0f6ebb9a75f;hpb=5e7a20e80099ce50538cadb06ce3ef4bb4a0d32c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 23cdbcb72..ae7551f49 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -32,6 +32,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e88c635401000000
 		alias	barriere-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d75b589aaa8b5801000000
+		alias	mirror-bytemark
+	}
+	multipath {
+		wwid	3600c0ff000d5ad34203b935801000000
+		alias	mirror-bytemark-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f559665401000000
 		alias	binet
@@ -96,14 +104,6 @@ multipaths {
 		wwid	3600c0ff000d5ad346a00655401000000
 		alias	donizetti-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34f780675401000000
-		alias	fede
-	}
-	multipath {
-		wwid	3600c0ff000d5ad341781675401000000
-		alias	fede-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad348670635401000000
 		alias	gideon
@@ -116,6 +116,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34bcd0635401000000
 		alias	httpredir-bm-01
 	}
+	multipath {
+		wwid	3600c0ff000d75b58ed4d215701000000
+		alias	httpredir-bm-01-srv
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -132,6 +136,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e86a635401000000
 		alias	lindsay-srv
 	}
+	multipath {
+		wwid	3600c0ff000d83a70921c115701000000
+		alias	manziarly
+	}
+	multipath {
+		wwid	3600c0ff000d83a709d1c115701000000
+		alias	manziarly-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
@@ -140,10 +152,6 @@ multipaths {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
-	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
@@ -157,12 +165,8 @@ multipaths {
 		alias	moszumanska-lvm
 	}
 	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
+		wwid	3600c0ff000d83a707ec2985701000000
+		alias	olin
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
@@ -198,19 +202,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
@@ -220,14 +224,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
@@ -244,6 +240,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
 		alias	rusca
@@ -260,6 +264,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -268,6 +276,10 @@ multipaths {
 		wwid	3600c0ff000d75b58264c825401000000
 		alias	sor-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a703b2dae5601000000
+		alias	tate
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
 		alias	ticharich