try to order these a bit

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 19359263f4f61c2b5dcdd355ed54f224f97fa54a..9c714a5c3e0cdb23840ec384ba1e7322f959aaef 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,6 @@
 Package {
-       require => File['/etc/apt/apt.conf.d/local-recommends']
+       require => File['/etc/apt/apt.conf.d/local-recommends'],
+       stage   => deploy_infra
 }
 
 File {
@@ -33,6 +34,7 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
 
        if $::hostname in [pasquini,tristano] {
                include ganeti2
@@ -62,50 +64,6 @@ node default {
                include unbound
        }
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
-               include puppetmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'muninmaster') {
-               include munin::master
-       }
-
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
-
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
-       }
-
-       if $::hostname in [chopin,franck,morricone,bizet] {
-               include roles::dakmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               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
-       }
-
-       if $::hostname in [bizet,morricone] {
-               include roles::backports_master
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
-       }
-
        if $::apache2 {
                include apache2
        }