X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=5e710a22ebad4cc8f1fe362cdc83a631dfbef6a0;hb=0699df5e6cd5bf98ef78f0ffcdec7db94b47866d;hp=a17f573f91e3bb2469a2131ac91f2f900cc460d2;hpb=8166041b9ec924a7617fd00274c22ae67fd6a16b;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 a17f573f9..5e710a22e 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -21,19 +21,6 @@ blacklist {
         }
 }
 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
@@ -48,44 +35,16 @@ multipaths {
                 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
@@ -113,22 +72,4 @@ multipaths {
                 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
-        }
 }