X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=affb8f203fb747b224774cacb4046693e71eea3d;hb=e3096f45c19ecfb2c6cd36922c98e58a0426e605;hp=c8de167ae09bdfea5c357528df7d3c95f149e9ed;hpb=e851f6ff6da06572e8ffbbb03d4d95c22d7af0c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index c8de167ae..affb8f203 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -13,33 +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	3600c0ff000d5ad34f559665401000000
-		alias	binet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34fb59665401000000
-		alias	binet-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad344455675401000000
 		alias	bmdb1
@@ -72,10 +56,6 @@ multipaths {
 		wwid	3600c0ff000d5ad347a49665401000000
 		alias	dillon
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d83a70ac13965601000000
 		alias	dillon-lvm2
@@ -96,14 +76,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 +84,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
@@ -136,46 +100,22 @@ multipaths {
 		wwid	3600c0ff000d5ad34e86a635401000000
 		alias	lindsay-srv
 	}
-	multipath {
-		wwid	3600c0ff000d83a70921c115701000000
-		alias	manziarly
-	}
-	multipath {
-		wwid	3600c0ff000d83a709d1c115701000000
-		alias	manziarly-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
 	}
 	multipath {
-		wwid	3600c0ff000d5ad341ca4655401000000
-		alias	milanollo
+		wwid	3600c0ff000d5ad341b39685c01000000
+		alias	mekeel-srv
 	}
 	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
+		wwid	3600c0ff000d5ad341ca4655401000000
+		alias	milanollo
 	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3454b3655401000000
-		alias	moszumanska
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34951e635401000000
-		alias	moszumanska-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
 		alias	paradis
@@ -206,14 +146,22 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
-		alias	philp
+		alias	OLD-philp
 	}
 	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 {
@@ -250,11 +198,11 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
-		alias	rusca
+		alias	OLD-rusca
 	}
 	multipath {
 		wwid	3600c0ff000d75b5869e03d5601000000
-		alias	rusca-lvm
+		alias	OLD-rusca-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
@@ -264,6 +212,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -284,20 +236,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
-	}
 }