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

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 4e66aa5af..affb8f203 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -13,40 +13,28 @@ 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
 	}
 	multipath {
-		wwid	3600c0ff000d83a704c2ed85101000000
-		alias	bmdb1-srv
+		wwid	3600c0ff000d5ad346dea825601000000
+		alias	bmdb1-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d83a70d912965601000000
+		alias	bmdb1-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f874635401000000
@@ -61,16 +49,16 @@ multipaths {
 		alias	delfin
 	}
 	multipath {
-		wwid	3600c0ff000d83a701052235201000000
-		alias	delfin-srv
+		wwid	3600c0ff000d5ad34aafd825601000000
+		alias	delfin-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad347a49665401000000
 		alias	dillon
 	}
 	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
+		wwid	3600c0ff000d83a70ac13965601000000
+		alias	dillon-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3421c3635401000000
@@ -88,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
@@ -104,10 +84,6 @@ multipaths {
 		wwid	3600c0ff000d5ad348d70635401000000
 		alias	gideon-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -129,33 +105,17 @@ multipaths {
 		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
@@ -186,23 +146,23 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
-		alias	philp
+		alias	OLD-philp
 	}
 	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
@@ -212,14 +172,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
@@ -236,13 +188,21 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
-		alias	rusca
+		alias	OLD-rusca
 	}
 	multipath {
 		wwid	3600c0ff000d75b5869e03d5601000000
-		alias	rusca-lvm
+		alias	OLD-rusca-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
@@ -252,6 +212,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -260,6 +224,10 @@ multipaths {
 		wwid	3600c0ff000d75b58264c825401000000
 		alias	sor-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a703b2dae5601000000
+		alias	tate
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
 		alias	ticharich
@@ -268,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
-	}
 }