X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=78fc80deb873886baa7faac4f4a942ea74119349;hb=f4dd89aa432f17d81aa3cd27dcac5343495e2fb5;hp=90b8367212ad7839bcf8600b44d989992ce67a4e;hpb=fa7d640c597bca484da3fdd09bb0e4927d70a454;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 90b836721..78fc80deb 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -33,6 +33,11 @@ multipaths {
                 wwid 3600c0ff000277c5fa859e15701000000
                 alias danzi-srv
         }
+        # debussy
+        multipath {
+                wwid 3600c0ff00027786c1541ce5901000000
+                alias debussy
+        }
         # diabelli
         multipath {
                 wwid 3600c0ff00027786cba48e05701000000
@@ -43,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
@@ -75,11 +62,24 @@ multipaths {
                 wwid 3600c0ff000277c5f1a05945901000000
                 alias godard-lvm
         }
+        multipath {
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
+        }
         # gombert
         multipath {
                 wwid 3600c0ff00027786c9cd8de5701000000
                 alias gombert
         }
+        # grabbe
+        multipath {
+                wwid 3600c0ff00027786c548cdf5a01000000
+                alias grabbe
+        }
+        multipath {
+                wwid 3600c0ff00027786c858cdf5a01000000
+                alias grabbe-lvm
+        }
         # gretchaninov
         multipath {
                 wwid 3600c0ff00027786c85aae35701000000
@@ -159,6 +159,15 @@ multipaths {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000