backports cleanup

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index cc82cda76cbdbec279295f92cf7d021d46cfbb41..b837c61f0260f95324c4ff4ebd856b3606ba9d4e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -13,8 +13,6 @@ class roles {
        #}
 
        if getfromhash($site::nodeinfo, 'buildd') {
-               $foo = getfromhash($site::nodeinfo, 'buildd')
-               notice("Buildd is ${foo}")
                include buildd
        }
 
@@ -35,10 +33,6 @@ class roles {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'ftp.d.o') {
                include roles::ftp
        }
@@ -47,11 +41,6 @@ class roles {
                include roles::ftp_upload
        }
 
-       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