move more to roles

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index bad77e5..f55e483 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -58,6 +58,22 @@ roles:
     - soler.debian.org
   sso:
     - diabelli.debian.org
+  static_master:
+    - bizet.debian.org
+    - dillon.debian.org
+    - franck.debian.org
+  static_mirror:
+    - busoni.debian.org
+    - klecker.debian.org
+    - senfter.debian.org
+  static_source:
+    - master.debian.org
+    - dillon.debian.org
+    - franck.debian.org
+    - philp.debian.org
+    - ravel.debian.org
+    - senfl.debian.org
+    - wolkenstein.debian.org
   syncproxy:
     - milanollo.debian.org
   udd:
@@ -66,6 +82,10 @@ roles:
     - vento.debian.org
   weblog_destination:
     - ravel.debian.org
+  weblog_provider:
+    - busoni.debian.org
+    - klecker.debian.org
+    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index b3cc794..be6e920 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -305,26 +305,6 @@ host_settings:
     - czerny.debian.org
     - rautavaara.debian.org
     - salieri.debian.org
-  static_master:
-    - bizet.debian.org
-    - dillon.debian.org
-    - franck.debian.org
-  static_mirror:
-    - busoni.debian.org
-    - klecker.debian.org
-    - senfter.debian.org
-  static_source:
-    - master.debian.org
-    - dillon.debian.org
-    - franck.debian.org
-    - philp.debian.org
-    - ravel.debian.org
-    - senfl.debian.org
-    - wolkenstein.debian.org
-  weblog_provider:
-    - busoni.debian.org
-    - klecker.debian.org
-    - senfter.debian.org
   buildd_master:
     - grieg.debian.org
     - wuiet.debian.org