From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 15 Oct 2016 12:54:11 +0000 (+0200)
Subject: Decommission jenko
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e79ac6dac609ecc7accfcd7a8596d1b2d915e0c8;p=mirror%2Fdsa-puppet.git

Decommission jenko

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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a4702d4d9..92dc81508 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -49,7 +49,6 @@ nameinfo:
   hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783)
   henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012)
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
-  jenko.debian.org: Davorin Jenko (November 9th, 1835 - November 25th. 1914)
   jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 365051266..ae6d003b3 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -21,11 +21,6 @@ blacklist {
         }
 }
 multipaths {
-        # jenko
-        multipath {
-                wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenko
-        }
         # glinka
         multipath {
                 wwid 3600c0ff000d5f6bdf0eaa45101000000