Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / multipath / templates / multipath-ubc-ganeti2.conf.erb

diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index 031cfc1..e21f731 100644 (file)
--- 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
@@ -85,6 +67,15 @@ multipaths {
                 wwid 3600c0ff00027786c9cd8de5701000000
                 alias gombert
         }
+        # grabbe
+        multipath {
+                wwid 3600c0ff00027786c548cdf5a01000000
+                alias grabbe
+        }
+        multipath {
+                wwid 3600c0ff00027786c858cdf5a01000000
+                alias grabbe-lvm
+        }
         # gretchaninov
         multipath {
                 wwid 3600c0ff00027786c85aae35701000000