Add wuiet volumes at UBC

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

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 3650512..79decc7 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -12,31 +12,10 @@ blacklist {
         devnode "^hd[a-z][[0-9]*]"
         devnode "^vd[a-z]"
         devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-<%- if %w{ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2}.include?(hostname) then -%>
-        devnode "^sda[0-9]*$"
-<%- end -%>
         device {
                 vendor DEC.*
                 product MSA[15]00
         }
 }
 multipaths {
-        # jenko
-        multipath {
-                wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenko
-        }
-        # glinka
-        multipath {
-                wwid 3600c0ff000d5f6bdf0eaa45101000000
-                alias r10-glinka
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdf1eaa45101000000
-                alias r10-glinka-srv
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd866d4c5101000000
-                alias r6-glinka-mirrors
-        }
 }