X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=79decc75109299500c9334bc641ce71ede832bf0;hb=25a86a70b52dd58455b2a448e1d142eaa6062812;hp=e947d1ad1af25ebca0dac79c2654227fb7f76b51;hpb=cb5fddfa90b64c673ae96a09c6e96a37eb86e516;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 e947d1ad1..79decc751 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -12,59 +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 {
-        # geo2
-        multipath {
-                wwid 3600c0ff000d5f6bd3ed7995101000000
-                alias r10-geo2
-        }
-        # lotti
-        multipath {
-                wwid 3600c0ff000d5f6bd9a2a9a5101000000
-                alias r10-lotti
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd1ab08c4c01000000
-                alias r6-lotti-srv
-        }
-        # jenko
-        multipath {
-                wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenko
-        }
-        # tchaikovsky
-        multipath {
-                wwid 3600c0ff000d5f6bd06f29c5101000000
-                alias r10-tchaikovsky
-        }
-        # tye
-        multipath {
-                wwid 3600c0ff000d5f6bdb08aa05101000000
-                alias r10-tye
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdb28aa05101000000
-                alias r10-tye-srv
-        }
-        # glinka
-        multipath {
-                wwid 3600c0ff000d5f6bdf0eaa45101000000
-                alias r10-glinka
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdf1eaa45101000000
-                alias r10-glinka-srv
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd866d4c5101000000
-                alias r6-glinka-mirrors
-        }
 }