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 7c118e7..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
@@ -96,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
@@ -168,14 +168,6 @@ multipaths {
                wwid    3600c0ff000d83a707ec2985701000000
                alias   olin
        }
-       multipath {
-               wwid    3600c0ff000d5ad342fca635401000000
-               alias   oyens
-       }
-       multipath {
-               wwid    3600c0ff000d5ad3437ca635401000000
-               alias   oyens-srv
-       }
        multipath {
                wwid    3600c0ff000d5ad341356645401000000
                alias   paradis
@@ -210,10 +202,18 @@ multipaths {
        }
        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 {
@@ -264,6 +264,10 @@ multipaths {
                wwid    3600c0ff000d5ad34c3bd675401000000
                alias   senfter-lvm
        }
+       multipath {
+               wwid    3600c0ff000d5ad3441148d5801000000
+               alias   senfter-lvm2
+       }
        multipath {
                wwid    3600c0ff000d75b58894b825401000000
                alias   sor