retire lilburn

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 919edb0ef9a546d182dc82d41d9b8ff8406f528a..c2a30bc3cd5af1809b2032a9de3f3eedf55fadd3 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -105,7 +105,6 @@ roles:
     - master.debian.org
     - dillon.debian.org
     - franck.debian.org
-    - lilburn.debian.org
     - lindsay.debian.org
     - philp.debian.org
     - ravel.debian.org

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 10467bc889f1c1c7670277fb304730f9bdac36c5..332a55055fe5c3a2a1d4d25dc704cc2ebe8cbe44 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -64,7 +64,6 @@ nameinfo:
   lamb.debian.org: John David Lamb (b. 1935)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
-  lilburn.debian.org: Douglas Gordon Lilburn (November 2nd, 1915 - June 6th, 2001)
   lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898)
   locke.debian.org: Matthew Locke (ca. 1621 - 1677)
   lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 9dbf70347aabefcbdfd794ddae2292b9e074b2d8..45613ab1590025fca3d042f4fab529c6baa20099 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -70,15 +70,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd1ab08c4c01000000
                 alias r6-lotti-srv
         }
-        # lilburn
-        multipath {
-                wwid 3600c0ff000d5f6bd40329a5101000000
-                alias r10-lilburn
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd46329a5101000000
-                alias r10-lilburn-srv
-        }
         # elgar
         multipath {
                 wwid 3600c0ff000d5f6bd04849b5101000000