debug_mirror -> hiera role, first step

[mirror/dsa-puppet.git] / data / common.yaml

diff --git a/data/common.yaml b/data/common.yaml
index 493121e..a13f295 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,22 +54,12 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/'
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  ftp_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - fasolo.debian.org
-  mailrelay:
-    # XXX - ONLY used by ferm templates/defs.conf.erb
-    - mailly.debian.org
-    - muffat.debian.org
   muninmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - menotti.debian.org
   nagiosmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - tchaikovsky.debian.org
-  security_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - seger.debian.org
   security_mirror:
     # XXX used also in ferm me.conf.erb
     mirror-anu.debian.org:
@@ -135,32 +125,15 @@ roles:
         - '[2a02:16a8:dc41:100::232]:80'
       fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
-  historical_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - sibelius.debian.org
-  historical_mirror:
-    # XXX used also in ferm me.conf.erb
-    - gretchaninov.debian.org
-    - klecker.debian.org
-    - schmelzer.debian.org
-    - sibelius.debian.org
   debug_mirror:
-    # XXX used also in ferm me.conf.erb
+    # XXX still used by the mirror health stuff
     mirror-accumu.debian.org:
-      onion_v4_address: 130.242.6.199
       service-hostname: accumu.debug.backend.mirrors.debian.org
     schmelzer.debian.org:
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      onion_v4_address: 217.196.149.232
       service-hostname: conova.debug.backend.mirrors.debian.org
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  ports_master:
-    # XXX - used by ferm templates/defs.conf.erb
-    - porta.debian.org
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org