stop hardcoding hosts

[dsa-puppet.git] / modules / roles / manifests / init.pp

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') {