historical_master -> hiera role

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

diff --git a/data/common.yaml b/data/common.yaml
index f5090f2..fd6328b 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,18 +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
   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:
@@ -131,9 +125,6 @@ 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
@@ -154,9 +145,6 @@ roles:
   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