X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=7a74e1d1c3593a0e7fa5162b006da2b0d7a07a30;hb=fc377f7a1b27a2f7d7e178e4c17bc929bfb21d14;hp=6ce4c40a8cda7d726a9831eea0d3cf02db1d98a5;hpb=8fa3cc6d69a8dd465da72dde4245b550fd2b48aa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 6ce4c40a8..7a74e1d1c 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -13,41 +13,17 @@ blacklist_exceptions {
 
 multipaths {
 	multipath {
-		wwid	3600c0ff000d5ad34b41a635401000000
-		alias	adayevskaya
+		wwid	3600c0ff000d5ad34d7d8fa5501000000
+		alias	OLD-backuphost
 	}
 	multipath {
-		wwid	3600c0ff000d5ad34d7d8fa5501000000
-		alias	backuphost
+		wwid	3600c0ff000d5ad3406de855d01000000
+		alias	backuphost2
 	}
 	multipath {
 		wwid	3600c0ff000d838e2e7d8fa5501000000
 		alias	backuphost-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346d96635401000000
-		alias	barriere
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34e88c635401000000
-		alias	barriere-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d75b589aaa8b5801000000
-		alias	mirror-bytemark
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34203b935801000000
-		alias	mirror-bytemark-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34f559665401000000
-		alias	binet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34fb59665401000000
-		alias	binet-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad344455675401000000
 		alias	bmdb1
@@ -118,24 +94,20 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34c76a635401000000
-		alias	lindsay
+		alias	OLD-lindsay
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e86a635401000000
-		alias	lindsay-srv
-	}
-	multipath {
-		wwid	3600c0ff000d83a70921c115701000000
-		alias	manziarly
-	}
-	multipath {
-		wwid	3600c0ff000d83a709d1c115701000000
-		alias	manziarly-lvm
+		alias	OLD-lindsay-srv
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
 	}
+	multipath {
+		wwid	3600c0ff000d5ad341b39685c01000000
+		alias	mekeel-srv
+	}
 	multipath {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
@@ -144,18 +116,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	3600c0ff000d5ad341356645401000000
 		alias	paradis
@@ -186,15 +146,7 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
-		alias	philp
-	}
-	multipath {
-		wwid	3600c0ff000d5ad348f67675401000000
-		alias	OLD-picconi
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34de57675401000000
-		alias	OLD-picconi-lvm
+		alias	OLD-philp
 	}
 	multipath {
 		wwid	3600c0ff000d83a709ddc705801000000
@@ -238,11 +190,11 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
-		alias	rusca
+		alias	OLD-rusca
 	}
 	multipath {
 		wwid	3600c0ff000d75b5869e03d5601000000
-		alias	rusca-lvm
+		alias	OLD-rusca-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
@@ -276,20 +228,4 @@ multipaths {
 		wwid	3600c0ff000d5ad34169d6b5401000000
 		alias	ticharich-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3463e4645401000000
-		alias	wuiet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad340ad9635401000000
-		alias	wuiet-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3442f4645401000000
-		alias	x86-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d5ad344af4645401000000
-		alias	x86-bm-01-lvm
-	}
 }