X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=b485273886fb0111df60f458871494da03e5f496;hb=2f47eaa7b4c14fde07d0bb7959a96907a4739db9;hp=786ab352544b5102c83c8c899ee29f2e0fd86f6c;hpb=65a0ed875e07c9eebca339533440a461c412a4d0;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 786ab3525..b48527388 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,34 +48,38 @@ multipaths {
                 wwid 3600c0ff00027786c2ed8de5701000000
                 alias elgar
         }
-        # fano
-        multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
-        }
+        # geo2
         multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
+                wwid 3600c0ff00027786cbf5ee25701000000
+                alias geo2
         }
-        # finzi
+        # godard
         multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
+                wwid 3600c0ff000277c5f1305945901000000
+                alias godard
         }
         multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
         }
-        # geo2
         multipath {
-                wwid 3600c0ff00027786cbf5ee25701000000
-                alias geo2
+                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
@@ -89,6 +98,15 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
+        # lindsay
+        multipath {
+                wwid 3600c0ff00027786ccb06865d01000000
+                alias lindsay
+        }
+        multipath {
+                wwid 3600c0ff00027786ce706865d01000000
+                alias lindsay-lvm
+        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -98,6 +116,15 @@ multipaths {
                 wwid 3600c0ff00027786cab5ee25701000000
                 alias lotti-srv
         }
+        # manziarly
+        multipath {
+                wwid 3600c0ff00027786c259d775d01000000
+                alias manziarly
+        }
+        multipath {
+                wwid 3600c0ff00027786c289d775d01000000
+                alias manziarly-lvm
+        }
         # menotti
         multipath {
                 wwid 3600c0ff00027786cec49e05701000000
@@ -121,6 +148,20 @@ multipaths {
                 wwid 3600c0ff00027786c0a49e05701000000
                 alias nono-lvm
         }
+        # pinel
+        multipath {
+                wwid 3600c0ff00027786c2c07865d01000000
+                alias pinel
+        }
+        multipath {
+                wwid 3600c0ff00027786c4f07865d01000000
+                alias pinel-lvm
+        }
+        # philp
+        multipath {
+                wwid 3600c0ff00027786c2a30825d01000000
+                alias philp
+        }
         # piu-slave-ubc-01
         multipath {
                 wwid 3600c0ff00027786cd29cb15801000000
@@ -145,11 +186,33 @@ multipaths {
                 wwid 3600c0ff00027786cff7ce25701000000
                 alias sonntag
         }
+        # static-master-ubc-01
+        multipath {
+                wwid 3600c0ff00027786c559a785d01000000
+                alias static-master-ubc-01
+        }
+        multipath {
+                wwid 3600c0ff000277c5f1a9b785d01000000
+                alias static-master-ubc-01-lvm-ssd
+        }
+        multipath {
+                wwid 3600c0ff00027786c8c9b785d01000000
+                alias static-master-ubc-01-lvm-hdd
+        }
         # tchaikovsky
         multipath {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000
@@ -168,6 +231,15 @@ multipaths {
                 wwid 3600c0ff000277c5f25cfe35701000000
                 alias ullmann-lvm
         }
+        # wuiet
+        multipath {
+                wwid 3600c0ff00027786c6b867a5d01000000
+                alias wuiet
+        }
+        multipath {
+                wwid 3600c0ff00027786c9b867a5d01000000
+                alias wuiet-lvm
+        }
         # x86-ubc-01
         multipath {
                 wwid 3600c0ff00027786cdc06dd5701000000
@@ -177,4 +249,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
+       }
 }