Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[mirror/dsa-puppet.git] / modules / multipath / templates / multipath-bm.conf.erb

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 3c808a8..ae7551f 100644 (file)
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -32,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
@@ -48,6 +56,10 @@ multipaths {
                wwid    3600c0ff000d5ad346dea825601000000
                alias   bmdb1-lvm
        }
+       multipath {
+               wwid    3600c0ff000d83a70d912965601000000
+               alias   bmdb1-lvm2
+       }
        multipath {
                wwid    3600c0ff000d5ad34f874635401000000
                alias   coccia
@@ -61,8 +73,8 @@ multipaths {
                alias   delfin
        }
        multipath {
-               wwid    3600c0ff000d83a701052235201000000
-               alias   delfin-srv
+               wwid    3600c0ff000d5ad34aafd825601000000
+               alias   delfin-lvm
        }
        multipath {
                wwid    3600c0ff000d5ad347a49665401000000
@@ -72,6 +84,10 @@ multipaths {
                wwid    3600c0ff000d5ad34fc2e665401000000
                alias   dillon-lvm
        }
+       multipath {
+               wwid    3600c0ff000d83a70ac13965601000000
+               alias   dillon-lvm2
+       }
        multipath {
                wwid    3600c0ff000d5ad3421c3635401000000
                alias   dinis
@@ -88,14 +104,6 @@ multipaths {
                wwid    3600c0ff000d5ad346a00655401000000
                alias   donizetti-srv
        }
-       multipath {
-               wwid    3600c0ff000d5ad34f780675401000000
-               alias   fede
-       }
-       multipath {
-               wwid    3600c0ff000d5ad341781675401000000
-               alias   fede-lvm
-       }
        multipath {
                wwid    3600c0ff000d5ad348670635401000000
                alias   gideon
@@ -108,6 +116,10 @@ multipaths {
                wwid    3600c0ff000d5ad34bcd0635401000000
                alias   httpredir-bm-01
        }
+       multipath {
+               wwid    3600c0ff000d75b58ed4d215701000000
+               alias   httpredir-bm-01-srv
+       }
        multipath {
                wwid    3600c0ff000d5ad34bf77335501000000
                alias   jerea
@@ -124,6 +136,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 +152,6 @@ multipaths {
                wwid    3600c0ff000d5ad341ca4655401000000
                alias   milanollo
        }
-       multipath {
-               wwid    3600c0ff000d5ad346921635401000000
-               alias   milanollo-lvm-old
-       }
        multipath {
                wwid    3600c0ff000d75b58b9f93d5501000000
                alias   milanollo-lvm
@@ -149,12 +165,8 @@ multipaths {
                alias   moszumanska-lvm
        }
        multipath {
-               wwid    3600c0ff000d5ad342fca635401000000
-               alias   oyens
-       }
-       multipath {
-               wwid    3600c0ff000d5ad3437ca635401000000
-               alias   oyens-srv
+               wwid    3600c0ff000d83a707ec2985701000000
+               alias   olin
        }
        multipath {
                wwid    3600c0ff000d5ad341356645401000000
@@ -190,19 +202,19 @@ multipaths {
        }
        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 +224,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,6 +240,14 @@ multipaths {
                wwid    3600c0ff000d5ad34efa7645401000000
                alias   rapoport
        }
+       multipath {
+               wwid    3600c0ff000d83a70491c465701000000
+               alias   respighi
+       }
+       multipath {
+               wwid    3600c0ff000d83a70861c465701000000
+               alias   respighi-lvm
+       }
        multipath {
                wwid    3600c0ff000d5ad343fe03d5601000000
                alias   rusca
@@ -252,6 +264,10 @@ multipaths {
                wwid    3600c0ff000d5ad34c3bd675401000000
                alias   senfter-lvm
        }
+       multipath {
+               wwid    3600c0ff000d5ad3441148d5801000000
+               alias   senfter-lvm2
+       }
        multipath {
                wwid    3600c0ff000d75b58894b825401000000
                alias   sor
@@ -260,6 +276,10 @@ multipaths {
                wwid    3600c0ff000d75b58264c825401000000
                alias   sor-lvm
        }
+       multipath {
+               wwid    3600c0ff000d83a703b2dae5601000000
+               alias   tate
+       }
        multipath {
                wwid    3600c0ff000d5ad346bc46b5401000000
                alias   ticharich