ports_master -> hiera role

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d4bc683..adc2795 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,57 +1,56 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
-
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
-               include puppetmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'muninmaster') {
+       if has_role('muninmaster') {
                include munin::master
        }
 
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       if has_role('nagiosmaster') {
                include nagios::server
        }
 
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
+       # archive.debian.org
+       if has_role('historical_mirror') {
+               include roles::historical_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'ftp_master') {
-               include roles::ftp_master
-               include roles::dakmaster
+       # debug archive
+       if has_role('debug_mirror') {
+               include roles::debug_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-               include roles::security_mirror
+       # ftp.debian.org and its ecosystem
+       if has_role('debian_mirror') {
+               include roles::debian_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-               include roles::www_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
+       if has_role('security_mirror') {
+               include roles::security_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'ftp.d.o') {
-               include roles::ftp
+       if has_role('postgres_backup_server') {
+               include postgres::backup_server
        }
 
-       if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
-               include roles::ftp_upload
+       if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
+               include roles::snapshot
        }
 
-       if getfromhash($site::nodeinfo, 'backports_master') {
-               include roles::backports_master
-               include roles::dakmaster
+       if has_role('bgp') {
+               include roles::bgp
        }
 
-       if getfromhash($site::nodeinfo, 'security_master') {
-               include roles::security_master
-               include roles::dakmaster
+       if has_role('postgresql_server') {
+               include postgres::backup_source
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if $::keyring_debian_org_mirror {
+               include roles::keyring_debian_org_mirror
        }
 }