stop hardcoding hosts

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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 10aef9171886bd7183ad658ccc21fce7603f55d0..cae7aff59f340b228634eb01f7e82bf4f2b0d45d 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -142,11 +142,16 @@ footer:
   #zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
+  backports_master:
+    - bizet.debian.org
+    - morricone.debian.org
   bugsmaster:
   bugsmx:
     - busoni.debian.org
   dbmaster:
     - draghi.debian.org
+  ftp_master:
+    - franck.debian.org
   ftp.d.o:
     - kassia.debian.org
     - klecker.debian.org

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 601e14400f35b782ddb9fde7734712ff811a8028..2bdae0d38f7e9581d4cf82ae9572039baeb8a675 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,7 +16,7 @@ class roles {
                include buildd
        }
 
-       if $::hostname in [chopin,franck,morricone,bizet] {
+       if getfromhash($site::nodeinfo, 'ftp_master') {
                include roles::dakmaster
        }
 
@@ -40,12 +40,14 @@ class roles {
                include roles::ftp_upload
        }
 
-       if $::hostname in [bizet,morricone] {
+       if getfromhash($site::nodeinfo, 'backports_master') {
                include roles::backports_master
+               include roles::dakmaster
        }
 
        if getfromhash($site::nodeinfo, 'security_master') {
                include roles::security_master
+               include roles::dakmaster
        }
 
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {