keep transitioning to roles

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

diff --git a/manifests/site.pp b/manifests/site.pp
index bb8f2c2e3299dcadac3574c6839058fb990bca9c..3aa5990985c37b4d78987b6c29701b2953db822e 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,7 @@ node default {
        include hardware
        include nagios::client
        include resolv
+       include roles
 
        if $::hostname in [pasquini,tristano] {
                include ganeti2
@@ -62,54 +63,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 getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
-               include roles::ftp_upload
-       }
-
-       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
        }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
new file mode 100644 (file)
index 0000000..137cd75
--- /dev/null
+++ b/modules/roles/manifests/init.pp
@@ -0,0 +1,50 @@
+class roles {
+
+       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 getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+               include roles::ftp_upload
+       }
+
+       if $::hostname in [bizet,morricone] {
+               include roles::backports_master
+       }
+
+       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
+               include roles::ftp-upcoming_mirror
+       }
+}