X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=79decc75109299500c9334bc641ce71ede832bf0;hb=95072525773d3ead4ac53220475f1f1d59ff2f84;hp=3ff119966907ede11a209ea4ab571f7ff0cb1119;hpb=dbfc5786422b91890346251d5e7ddbd62c9e430c;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 3ff119966..79decc751 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -7,141 +7,15 @@
 #
 #   sed -re 's#(.{6})(.{6})0000(.{2})(.*)#36\1000\2\3\4#'
 
-defaults {
-        udev_dir                /dev
-        polling_interval        10
-        path_selector           "round-robin 0"
-        path_grouping_policy    multibus
-        getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
-        path_checker            readsector0
-        rr_min_io               100
-        rr_weight               priorities
-        failback                immediate
-        no_path_retry           fail
-        user_friendly_names     yes
-}
 blacklist {
         devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
         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 {
-        # reger
-        multipath {
-                wwid 3600c0ff000d5f6bd5dabd64c01000000
-                alias reger-boot
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd72ac375101000000
-                alias r10-reger-root
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd1dfe9d5101000000
-                alias r10-reger
-        }
-        # geo2
-        multipath {
-                wwid 3600c0ff000d5f6bd3ed7995101000000
-                alias r10-geo2
-        }
-        # lotti
-        multipath {
-                wwid 3600c0ff000d5f6bd9a2a9a5101000000
-                alias r10-lotti
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd1ab08c4c01000000
-                alias r6-lotti-srv
-        }
-        # elgar
-        multipath {
-                wwid 3600c0ff000d5f6bd04849b5101000000
-                alias r10-elgar
-        }
-        # jenko
-        multipath {
-                wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenko
-        }
-        # fano
-        multipath {
-                wwid 3600c0ff000d5f6bd71c19c5101000000
-                alias r10-fano
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd87c49c5101000000
-                alias r10-fano-srv
-        }
-        # finzi
-        multipath {
-                wwid 3600c0ff000d5f6bd68ec9c5101000000
-                alias r10-finzi
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bddd0bee4f01000000
-                alias r10-finzi-srv
-        }
-        # tchaikovsky
-        multipath {
-                wwid 3600c0ff000d5f6bd06f29c5101000000
-                alias r10-tchaikovsky
-        }
-        # gombert
-        multipath {
-                wwid 3600c0ff000d5f6bd318a9e5101000000
-                alias r10-gombert
-        }
-        # 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
-        }
-        # diabelli
-        multipath {
-                wwid 3600c0ff000d5f6bdfa42aa5101000000
-                alias r10-diabelli
-        }
-        # nono
-        multipath {
-                wwid 3600c0ff000d5f6bd0944b85101000000
-                alias r10-nono
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd6c75695501000000
-                alias r10-nono-lvm
-        }
-        # bizet
-        multipath {
-                wwid 3600c0ff000d5f6bdba31435501000000
-                alias r10-bizet
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdc5d83f4f01000000
-                alias bizet-srv
-        }
 }