X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=17dd16682e04d928335094ce7f5f1326f28c9301;hb=89fc076c1e193a7a052008feb61a0276afce523a;hp=b117926c2d1da99124399f5e8a26611b60ac6450;hpb=9469cafc832582d0d9964972cb57906cf870f941;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 b117926c2..17dd16682 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -25,7 +25,7 @@ blacklist {
         devnode "^hd[a-z][[0-9]*]"
         devnode "^vd[a-z]"
         devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-<%- if %w{pasquini tristano boito bertali}.include?(hostname) then -%>
+<%- if %w{ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {
@@ -117,11 +117,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd318a9e5101000000
                 alias r10-gombert
         }
-        # blavet
-        multipath {
-                wwid 3600c0ff000d5f6bd736aa05101000000
-                alias r10-blavet
-        }
         # tye
         multipath {
                 wwid 3600c0ff000d5f6bdb08aa05101000000
@@ -154,6 +149,10 @@ multipaths {
                 wwid 3600c0ff000d5f6bd0944b85101000000
                 alias r10-nono
         }
+        multipath {
+                wwid 3600c0ff000d5f6bd6c75695501000000
+                alias r10-nono-lvm
+        }
         # bizet
         multipath {
                 wwid 3600c0ff000d5f6bdba31435501000000