X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=89f848acd6fabbd68117f71462348b638ed60c7f;hb=68f4262b49f1ecf57660e2bfa191879a056fc719;hp=7c118e76a3f1c01ceb42b7bd053c398b0689969c;hpb=2317c37b20e7402f9356d25ce8df01c9b9a49764;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 7c118e76a..89f848acd 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -32,14 +32,6 @@ multipaths {
 		wwid	3600c0ff000d5ad34e88c635401000000
 		alias	barriere-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34f559665401000000
-		alias	binet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34fb59665401000000
-		alias	binet-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad344455675401000000
 		alias	bmdb1
@@ -72,10 +64,6 @@ multipaths {
 		wwid	3600c0ff000d5ad347a49665401000000
 		alias	dillon
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d83a70ac13965601000000
 		alias	dillon-lvm2
@@ -96,14 +84,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 +92,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
@@ -148,6 +120,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
 	}
+	multipath {
+		wwid	3600c0ff000d5ad341b39685c01000000
+		alias	mekeel-srv
+	}
 	multipath {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
@@ -156,26 +132,6 @@ multipaths {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3454b3655401000000
-		alias	moszumanska
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34951e635401000000
-		alias	moszumanska-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d83a707ec2985701000000
-		alias	olin
-	}
-	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
 		alias	paradis
@@ -210,10 +166,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 {
@@ -264,6 +228,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -292,12 +260,4 @@ multipaths {
 		wwid	3600c0ff000d5ad340ad9635401000000
 		alias	wuiet-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3442f4645401000000
-		alias	x86-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d5ad344af4645401000000
-		alias	x86-bm-01-lvm
-	}
 }