prepare pinel for popcon

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 83137e59db24b13e41428fdfb5d34a19e24d84bb..78cbfb52e2a2ee9a25acfcb0f49e8b605fb223b9 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -15,36 +15,44 @@ roles:
     - beach.debian.org
   buildd_master:
     - wuiet.debian.org
+  buildd_ports_master:
+    - portman.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
     - draghi.debian.org
   dns_primary:
     - denis.debian.org
-  dns_secondary:
-    - orff.debian.org
   dns_geo:
     - geo1.debian.org
     - geo2.debian.org
     - geo3.debian.org
   extranrpeclient:
     - denis.debian.org
-    - orff.debian.org
   ftp.d.o:
     - klecker.debian.org
   ftp_master:
     - franck.debian.org
   ftp.upload.d.o:
     - franck.debian.org
-    - ravel.debian.org
+    - coccia.debian.org
+  api.ftp-master:
+    - coccia.debian.org
   git_master:
     - adayevskaya.debian.org
   keyring:
     - kaufmann.debian.org
   keystone:
     - oyens.debian.org
+  keystone_rabbitmq:
+    - rainier.debian.org
+    - rapoport.debian.org
+  memcached:
+    - oyens.debian.org
   lists:
     - bendel.debian.org
+  list_search:
+    - stockhausen.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -61,13 +69,20 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
+  people:
+    - paradis.debian.org
   piuparts:
     - pejacevic.debian.org
+  popcon:
+    - popov.debian.org
+    - pinel.debian.org
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
   puppetmaster:
     - handel.debian.org
+  qamaster:
+    - quantz.debian.org
   release:
     - franck.debian.org
   rtmaster:
@@ -78,6 +93,10 @@ roles:
     - soler.debian.org
   rtc:
     - vogler.debian.org
+  search_backend:
+    - wolkenstein.debian.org
+  search_frontend:
+    - cgi-grnet-01.debian.org
   sso:
     - diabelli.debian.org
   static_master:
@@ -88,31 +107,40 @@ roles:
     - busoni.debian.org
     - klecker.debian.org
     - senfter.debian.org
+    - mirror-csail.debian.org
+  # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
+  static_mirror_nopush:
+    - dummy
   static_source:
     - master.debian.org
     - dillon.debian.org
+    - donizetti.debian.org
     - franck.debian.org
+    - lindsay.debian.org
     - philp.debian.org
-    - ravel.debian.org
-    - senfl.debian.org
     - wolkenstein.debian.org
   syncproxy:
     - milanollo.debian.org
+  tracker:
+    - ticharich.debian.org
   udd:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  weblog_destination:
-    - ravel.debian.org
-  weblog_provider:
-    - busoni.debian.org
-    - klecker.debian.org
-    - senfter.debian.org
+  #weblog_destination:
+  #  - rXXXX.debian.org
+  #weblog_provider:
+  #  - busoni.debian.org
+  #  - klecker.debian.org
+  #  - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
     - wolkenstein.debian.org
   postgres_backup_server:
-    - backuphost.debian.org
+    - storace.debian.org
+  dabackup_client:
+    - moszumanska.debian.org
+    - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org