From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 19 Sep 2016 22:10:15 +0000 (+0200)
Subject: Drop multipath mappings for nono.d.o and reger.d.o on ganeti2.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0699df5e6cd5bf98ef78f0ffcdec7db94b47866d;p=mirror%2Fdsa-puppet.git

Drop multipath mappings for nono.d.o and reger.d.o on ganeti2.d.o

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index e1b94cb62..5e710a22e 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -21,19 +21,6 @@ blacklist {
         }
 }
 multipaths {
-        # reger
-        multipath {
-                wwid 3600c0ff000d5f6bd5dabd64c01000000
-                alias reger-boot
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd72ac375101000000
-                alias r10-reger-root
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd1dfe9d5101000000
-                alias r10-reger
-        }
         # geo2
         multipath {
                 wwid 3600c0ff000d5f6bd3ed7995101000000
@@ -85,13 +72,4 @@ multipaths {
                 wwid 3600c0ff000d5f6bdfa42aa5101000000
                 alias r10-diabelli
         }
-        # nono
-        multipath {
-                wwid 3600c0ff000d5f6bd0944b85101000000
-                alias r10-nono
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd6c75695501000000
-                alias r10-nono-lvm
-        }
 }