X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=9ffe42441e598b2337685ec94b740ff37f78f18f;hb=83b436d346ecd8fdd2fa77caa2c32466b584806d;hp=f1910bc4c1213fc28787c53d3daffcbfa761aabb;hpb=63e1f7eac59979ee02af76940b8207aca36dff27;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 f1910bc4c..9ffe42441 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -15,29 +15,276 @@ blacklist {
         devnode "^sda[0-9]*$"
 }
 multipaths {
-        # fano
+        # buxtehude
         multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
+                wwid 3600c0ff00027786c0a0de45701000000
+                alias buxtehude
         }
         multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
+                wwid 3600c0ff000277c5f100de45701000000
+                alias buxtehude-lvm
         }
-        # finzi
+        # danzi
         multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
+                wwid 3600c0ff00027786ca059e15701000000
+                alias danzi
         }
         multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
+                wwid 3600c0ff000277c5fa859e15701000000
+                alias danzi-srv
+        }
+        # debussy
+        multipath {
+                wwid 3600c0ff00027786c1541ce5901000000
+                alias debussy
+        }
+        # diabelli
+        multipath {
+                wwid 3600c0ff00027786cba48e05701000000
+                alias diabelli
+        }
+        # donizetti
+        multipath {
+                wwid 3600c0ff00027786cf4a0875d01000000
+                alias donizetti
+        }
+        multipath {
+                wwid 3600c0ff00027786cfea0875d01000000
+                alias donizetti-lvm
+        }
+        # elgar
+        multipath {
+                wwid 3600c0ff00027786c2ed8de5701000000
+                alias elgar
+        }
+        # geo2
+        multipath {
+                wwid 3600c0ff00027786cbf5ee25701000000
+                alias geo2
+        }
+        # godard
+        multipath {
+                wwid 3600c0ff000277c5f1305945901000000
+                alias godard
+        }
+        multipath {
+                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
+                alias gretchaninov
+        }
+        multipath {
+                wwid 3600c0ff00027786cefaae35701000000
+                alias gretchaninov-srv
+        }
+        # hier
+        multipath {
+                wwid 3600c0ff00027786c588a135901000000
+                alias hier
+        }
+        multipath {
+                wwid 3600c0ff00027786c5a8a135901000000
+                alias hier-srv
+        }
+        # jerea
+        multipath {
+                wwid 3600c0ff00027786c4ad9885d01000000
+                alias jerea
+        }
+        multipath {
+                wwid 3600c0ff00027786c7dd9885d01000000
+                alias jerea-lvm
+        }
+        # lindsay
+        multipath {
+                wwid 3600c0ff00027786ccb06865d01000000
+                alias lindsay
+        }
+        multipath {
+                wwid 3600c0ff00027786ce706865d01000000
+                alias lindsay-lvm
+        }
+        # lotti
+        multipath {
+                wwid 3600c0ff00027786ca35ee25701000000
+                alias lotti
+        }
+        multipath {
+                wwid 3600c0ff00027786cab5ee25701000000
+                alias lotti-srv
+        }
+        # manziarly
+        multipath {
+                wwid 3600c0ff00027786c259d775d01000000
+                alias manziarly
+        }
+        multipath {
+                wwid 3600c0ff00027786c289d775d01000000
+                alias manziarly-lvm
+        }
+        # mekeel
+        multipath {
+                wwid 3600c0ff000277c5f98a28d5d01000000
+                alias mekeel
+        }
+        multipath {
+                wwid 3600c0ff00027786c25a48d5d01000000
+                alias mekeel-lvm
+        }
+        # menotti
+        multipath {
+                wwid 3600c0ff00027786cec49e05701000000
+                alias menotti
+        }
+        multipath {
+                wwid 3600c0ff000277c5ff349e05701000000
+                alias menotti-srv
+        }
+        # muffat
+        multipath {
+                wwid 3600c0ff00027786cb85ee25701000000
+                alias muffat
+        }
+        # nono
+        multipath {
+                wwid 3600c0ff00027786c0549e05701000000
+                alias nono
+        }
+        multipath {
+                wwid 3600c0ff00027786c0a49e05701000000
+                alias nono-lvm
+        }
+        # paradis
+        multipath {
+                wwid 3600c0ff00027786c821d895d01000000
+                alias paradis
+        }
+        multipath {
+                wwid 3600c0ff00027786c8c1d895d01000000
+                alias paradis-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
+                alias piu-slave-ubc-01
+        }
+        multipath {
+                wwid 3600c0ff00027786ce59cb15801000000
+                alias piu-slave-ubc-01-swap
         }
         # rachmaninoff
         multipath {
                 wwid 3600c0ff000277c5f4505d15701000000
                 alias rachmaninoff
         }
+        # reger
+        multipath {
+                wwid 3600c0ff00027786cc148e05701000000
+                alias reger
+        }
+        # sonntag
+        multipath {
+                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
+        }
+        # ticharich
+        multipath {
+                wwid 3600c0ff00027786cfe68875d01000000
+                alias ticharich
+        }
+        multipath {
+                wwid 3600c0ff00027786c0a69875d01000000
+                alias ticharich-lvm
+        }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
+        # tye
+        multipath {
+                wwid 3600c0ff00027786c2ecfe35701000000
+                alias tye
+        }
+        multipath {
+                wwid 3600c0ff00027786c39cfe35701000000
+                alias tye-srv
+                }
+        # ullmann
+        multipath {
+                wwid 3600c0ff00027786c21cfe35701000000
+                alias ullmann
+        }
+        multipath {
+                wwid 3600c0ff000277c5f25cfe35701000000
+                alias ullmann-lvm
+        }
+        # wuiet
+        multipath {
+                wwid 3600c0ff00027786c6b867a5d01000000
+                alias wuiet
+        }
+        multipath {
+                wwid 3600c0ff00027786c9b867a5d01000000
+                alias wuiet-lvm
+        }
         # x86-ubc-01
         multipath {
                 wwid 3600c0ff00027786cdc06dd5701000000
@@ -47,4 +294,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
+       }
 }