X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=6ce4c40a8cda7d726a9831eea0d3cf02db1d98a5;hb=08a21d49a4973b76493e3a50d25c3e98f07cb92b;hp=863f9d18edab879d5e0710d6d34e14aaeb8b8399;hpb=78a64b00e3ff83c0ef1cbd32073e3df52f6a388c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 863f9d18e..6ce4c40a8 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -16,6 +16,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34b41a635401000000
 		alias	adayevskaya
 	}
+	multipath {
+		wwid	3600c0ff000d5ad34d7d8fa5501000000
+		alias	backuphost
+	}
+	multipath {
+		wwid	3600c0ff000d838e2e7d8fa5501000000
+		alias	backuphost-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346d96635401000000
 		alias	barriere
@@ -24,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
@@ -37,8 +53,12 @@ multipaths {
 		alias	bmdb1
 	}
 	multipath {
-		wwid	3600c0ff000d83a704c2ed85101000000
-		alias	bmdb1-srv
+		wwid	3600c0ff000d5ad346dea825601000000
+		alias	bmdb1-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d83a70d912965601000000
+		alias	bmdb1-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f874635401000000
@@ -48,29 +68,21 @@ multipaths {
 		wwid	3600c0ff000d5ad34ac83635401000000
 		alias	coccia-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34cd996b5401000000
-		alias	couper
-	}
-	multipath {
-		wwid	3600c0ff000d83a7048ef105201000000
-		alias	couper-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34389b6b5401000000
 		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 +100,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 +108,6 @@ multipaths {
 		wwid	3600c0ff000d5ad348d70635401000000
 		alias	gideon-srv
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -124,6 +124,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e86a635401000000
 		alias	lindsay-srv
 	}
+	multipath {
+		wwid	3600c0ff000d83a70921c115701000000
+		alias	manziarly
+	}
+	multipath {
+		wwid	3600c0ff000d83a709d1c115701000000
+		alias	manziarly-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
@@ -132,10 +140,6 @@ multipaths {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
-	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
@@ -149,12 +153,8 @@ multipaths {
 		alias	moszumanska-lvm
 	}
 	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
+		wwid	3600c0ff000d83a707ec2985701000000
+		alias	olin
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
@@ -176,16 +176,32 @@ multipaths {
 		wwid	3600c0ff000d5ad34e7e9645401000000
 		alias	petrova
 	}
+	multipath {
+		wwid	3600c0ff000d5ad343c439d5501000000
+		alias	pinel
+	}
+	multipath {
+		wwid	3600c0ff000d5ad345c439d5501000000
+		alias	pinel-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
 		alias	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 {
@@ -196,14 +212,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
@@ -220,6 +228,22 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d5ad343fe03d5601000000
+		alias	rusca
+	}
+	multipath {
+		wwid	3600c0ff000d75b5869e03d5601000000
+		alias	rusca-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
 		alias	senfter
@@ -228,6 +252,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -236,6 +264,10 @@ multipaths {
 		wwid	3600c0ff000d75b58264c825401000000
 		alias	sor-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a703b2dae5601000000
+		alias	tate
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
 		alias	ticharich