X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=dcbb1e560925d50338f974b7efc4af80fa59c5b5;hb=74b848186ff77f1247370d033d9e7e8806193317;hp=6baf03c412e7cdcccf407b5541042847348a605e;hpb=071f8205d293606c7dda9686e3a0a0603d9f0717;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 6baf03c41..dcbb1e560 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,7 +35,6 @@ roles:
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
-    - franck.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
@@ -54,13 +53,9 @@ roles:
     - jerea.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:
@@ -139,9 +134,10 @@ roles:
     - quantz.debian.org
     - tate.debian.org
     - ticharich.debian.org
+    - wilder.debian.org
   static_master:
     - dillon.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - porta.debian.org
   static_mirror:
     - busoni.debian.org
@@ -164,13 +160,14 @@ roles:
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
-    - franck.debian.org
+    - fasolo.debian.org
     - lindsay.debian.org
     - mekeel.debian.org
     - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
     - wolkenstein.debian.org
+    - wuiet.debian.org
   syncproxy:
     - klecker.debian.org
     - milanollo.debian.org
@@ -210,6 +207,8 @@ roles:
     - gombert.debian.org
   veyepar.debian.org:
     - vittoria.debian.org
+  sreview.debian.org:
+    - vittoria.debian.org
   debug_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -236,3 +235,21 @@ roles:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
+  experimental_apache:
+    - beach.debian.org
+    - busoni.debian.org
+    - draghi.debian.org
+    - klecker.debian.org
+    - lobos.debian.org
+    - mirror-anu.debian.org
+    - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - picconi.debian.org
+    - pkgmirror-csail.debian.org
+    - santoro.debian.org
+    - sechter.debian.org
+    - senfter.debian.org
+    - setoguchi.debian.org
+    - villa.debian.org
+    - wieck.debian.org