Only do the ferm stuff for cluster ganeti2.d.o

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fbe2d47..647f457 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,8 +16,8 @@ class roles {
                include buildd
        }
 
-       if getfromhash($site::nodeinfo, 'bugs_search') {
-               include roles::bugs_search
+       if getfromhash($site::nodeinfo, 'bugs_mirror') {
+               include roles::bugs_mirror
        }
 
        if getfromhash($site::nodeinfo, 'ftp_master') {
@@ -59,6 +59,10 @@ class roles {
                include roles::www_master
        }
 
+       if getfromhash($site::nodeinfo, 'keyring') {
+               include roles::keyring
+       }
+
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
                include roles::ftp-upcoming_mirror
        }