move hiera.yaml into repo root

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d340002..e53f7e4 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -52,9 +52,6 @@ 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:
-  extranrpeclient:
-    # XXX - used by ferm templates/defs.conf.erb
-    - denis.debian.org
   ftp_master:
     # XXX - used by ferm templates/defs.conf.erb
     - fasolo.debian.org
@@ -62,9 +59,6 @@ roles:
     # XXX - ONLY used by ferm templates/defs.conf.erb
     - mailly.debian.org
     - muffat.debian.org
-  mirrormaster:
-    # XXX - used by ferm templates/defs.conf.erb
-    - melartin.debian.org
   muninmaster:
     # XXX - used by ferm templates/defs.conf.erb
     - menotti.debian.org
@@ -110,16 +104,6 @@ roles:
     wieck.debian.org:
       service-hostname: wieck.security.backend.mirrors.debian.org
       fastly-backend: true
-  syncproxy:
-    # XXX - used by ferm templates/defs.conf.erb
-    - gretchaninov.debian.org
-    - klecker.debian.org
-    - milanollo.debian.org
-    - mirror-anu.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - schmelzer.debian.org
-    - smit.debian.org
   postgres_backup_server:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org
@@ -131,6 +115,7 @@ roles:
         - '130.89.148.12:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
+    new-klecker.debian.org: {}
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -185,6 +170,7 @@ roles:
     - fasolo.debian.org
     - lw07.debian.org
     - melartin.debian.org
+    - postgresql-manda-01.debian.org
     - sallinen.debian.org
     - seger.debian.org
     - snapshotdb-manda-01.debian.org