X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=238f24a9f6f601a9264803b89c5aeefe66d50df2;hb=9a1fd5f05a8593ae282383bbace383992cb720ff;hp=9398e38bfa4cda359fc2b65c0cf9504dacffcfec;hpb=b53cd1d6c41759bca1200c4fd74383810d440e16;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 9398e38bf..238f24a9f 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -59,8 +59,12 @@ multipaths {
                 alias godard
         }
         multipath {
-                wwid 3600c0ff000277c5f1a05945901000000
-                alias godard-lvm
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
+        }
+        multipath {
+                wwid 3600c0ff000277c5ff9b9035d01000000
+                alias godard-lvm-ssd
         }
         # gombert
         multipath {
@@ -74,7 +78,7 @@ multipaths {
         }
         multipath {
                 wwid 3600c0ff00027786c858cdf5a01000000
-                alias grabbe-srv
+                alias grabbe-lvm
         }
         # gretchaninov
         multipath {
@@ -94,11 +98,6 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
-        # kantuser
-        multipath {
-                wwid 3600c0ff00027786c6cfa165a01000000
-                alias kantuser
-        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -160,6 +159,15 @@ multipaths {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000
@@ -187,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
+       }
 }