sso -> hiera role; explicitly include apache2

[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 bd6dbf6..f9096f6 100644 (file)
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -12,10 +12,6 @@ blacklist_exceptions {
 }
 
 multipaths {
-       multipath {
-               wwid    3600c0ff000d5ad34b41a635401000000
-               alias   adayevskaya
-       }
        multipath {
                wwid    3600c0ff000d5ad34d7d8fa5501000000
                alias   backuphost
@@ -24,22 +20,6 @@ multipaths {
                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
@@ -128,6 +108,10 @@ multipaths {
                wwid    3600c0ff000d5ad34f1f56f5501000000
                alias   mekeel
        }
+       multipath {
+               wwid    3600c0ff000d5ad341b39685c01000000
+               alias   mekeel-srv
+       }
        multipath {
                wwid    3600c0ff000d5ad341ca4655401000000
                alias   milanollo
@@ -136,10 +120,6 @@ multipaths {
                wwid    3600c0ff000d75b58b9f93d5501000000
                alias   milanollo-lvm
        }
-       multipath {
-               wwid    3600c0ff000d83a707ec2985701000000
-               alias   olin
-       }
        multipath {
                wwid    3600c0ff000d5ad341356645401000000
                alias   paradis
@@ -268,12 +248,4 @@ multipaths {
                wwid    3600c0ff000d5ad340ad9635401000000
                alias   wuiet-lvm
        }
-       multipath {
-               wwid    3600c0ff000d5ad3442f4645401000000
-               alias   x86-bm-01
-       }
-       multipath {
-               wwid    3600c0ff000d5ad344af4645401000000
-               alias   x86-bm-01-lvm
-       }
 }