X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=79decc75109299500c9334bc641ce71ede832bf0;hb=5830a865a00db0d6eeab2a7dc3161f6d47fa3008;hp=ae6d003b3aff9148e6e3a6044bae11be8a2e347d;hpb=e79ac6dac609ecc7accfcd7a8596d1b2d915e0c8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index ae6d003b3..79decc751 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -12,26 +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 {
-        # glinka
-        multipath {
-                wwid 3600c0ff000d5f6bdf0eaa45101000000
-                alias r10-glinka
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdf1eaa45101000000
-                alias r10-glinka-srv
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd866d4c5101000000
-                alias r6-glinka-mirrors
-        }
 }