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=3f1890171246b09c2077955f80bb3e9696c7d24c;hpb=2ecfe9d9cd32c6aecd54b6f4e34d3759761e7650;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 3f1890171..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
@@ -165,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
@@ -206,10 +202,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 {
@@ -260,6 +264,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor