X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=ed4a609129cb6a68d049a40519b274cf7e674087;hb=2ecfe9d9cd32c6aecd54b6f4e34d3759761e7650;hp=4327b9a0dc027302b096ec714df12c665bfdc24b;hpb=e8862bd29c97afcdf772f9c689948e958ae71295;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 4327b9a0d..ed4a60912 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -7,25 +7,12 @@
 #
 #   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{pasquini ubc-bl3 boito ubc-bl2}.include?(hostname) then -%>
+<%- if %w{ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {
@@ -52,15 +39,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd3ed7995101000000
                 alias r10-geo2
         }
-        # brahms
-        multipath {
-                wwid 3600c0ff000d5f6bdf4fa995101000000
-                alias r10-brahms
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdfdfa995101000000
-                alias r10-brahms-srv
-        }
         # lotti
         multipath {
                 wwid 3600c0ff000d5f6bd9a2a9a5101000000
@@ -75,19 +53,10 @@ multipaths {
                 wwid 3600c0ff000d5f6bd04849b5101000000
                 alias r10-elgar
         }
-        # jenkins
+        # jenko
         multipath {
                 wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenkins
-        }
-        # popov
-        multipath {
-                wwid 3600c0ff000d5f6bda9a19b5101000000
-                alias r10-popov
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdaaa19b5101000000
-                alias r10-popov-srv
+                alias r10-jenko
         }
         # fano
         multipath {
@@ -149,13 +118,8 @@ multipaths {
                 wwid 3600c0ff000d5f6bd0944b85101000000
                 alias r10-nono
         }
-        # bizet
-        multipath {
-                wwid 3600c0ff000d5f6bdba31435501000000
-                alias r10-bizet
-        }
         multipath {
-                wwid 3600c0ff000d5f6bdc5d83f4f01000000
-                alias bizet-srv
+                wwid 3600c0ff000d5f6bd6c75695501000000
+                alias r10-nono-lvm
         }
 }