X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=238f24a9f6f601a9264803b89c5aeefe66d50df2;hb=9a1fd5f05a8593ae282383bbace383992cb720ff;hp=031cfc18794bdee119d8658bd4bcd2ce3978f058;hpb=fa1d81cd557aa9f3446fa260eaf08c86fbff072c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index 031cfc187..238f24a9f 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -48,24 +48,6 @@ multipaths {
                 wwid 3600c0ff00027786c2ed8de5701000000
                 alias elgar
         }
-        # fano
-        multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
-        }
-        multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
-        }
-        # finzi
-        multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
-        }
-        multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
-        }
         # geo2
         multipath {
                 wwid 3600c0ff00027786cbf5ee25701000000
@@ -77,14 +59,27 @@ multipaths {
                 alias godard
         }
         multipath {
-                wwid 3600c0ff000277c5f1a05945901000000
-                alias godard-lvm
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
+        }
+        multipath {
+                wwid 3600c0ff000277c5ff9b9035d01000000
+                alias godard-lvm-ssd
         }
         # gombert
         multipath {
                 wwid 3600c0ff00027786c9cd8de5701000000
                 alias gombert
         }
+        # grabbe
+        multipath {
+                wwid 3600c0ff00027786c548cdf5a01000000
+                alias grabbe
+        }
+        multipath {
+                wwid 3600c0ff00027786c858cdf5a01000000
+                alias grabbe-lvm
+        }
         # gretchaninov
         multipath {
                 wwid 3600c0ff00027786c85aae35701000000
@@ -103,11 +98,6 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
-        # kantuser
-        multipath {
-                wwid 3600c0ff00027786c6cfa165a01000000
-                alias kantuser
-        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -169,6 +159,15 @@ multipaths {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000
@@ -196,4 +195,13 @@ multipaths {
                 wwid 3600c0ff00027786c3137dc5701000000
                 alias x86-ubc-01-lvm
         }
+        # x86-ubc-02
+        multipath {
+                wwid 3600c0ff00027786cd3fc075d01000000
+                alias x86-ubc-02
+        }
+        multipath {
+                wwid 3600c0ff00027786c0cfd075d01000000
+                alias x86-ubc-02-lvm
+       }
 }