Hiera does not know how to look up anything but top-level values

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 137cd75e4da7b839b08172ae00a21e4f35cd4967..1178aa3ecfb45a9e5e51c25aeb6611da3b955f07 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,6 +1,8 @@
 class roles {
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
+       $roles = hiera('roles')
+
+       if $::hostname in $roles['puppetmaster'] {
                include puppetmaster
        }
 
@@ -8,15 +10,24 @@ class roles {
                include munin::master
        }
 
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
+       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       #       include nagios::server
+       #}
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
        }
 
-       if $::hostname in [chopin,franck,morricone,bizet] {
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
+       }
+
+       if getfromhash($site::nodeinfo, 'bugs_mirror') {
+               include roles::bugs_mirror
+       }
+
+       if getfromhash($site::nodeinfo, 'ftp_master') {
+               include roles::ftp_master
                include roles::dakmaster
        }
 
@@ -28,10 +39,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
        }
@@ -40,11 +47,107 @@ class roles {
                include roles::ftp_upload
        }
 
-       if $::hostname in [bizet,morricone] {
-               include roles::backports_master
+       if getfromhash($site::nodeinfo, 'security_master') {
+               include roles::security_master
+               include roles::dakmaster
+       }
+
+       if getfromhash($site::nodeinfo, 'www_master') {
+               include roles::www_master
+       }
+
+       if getfromhash($site::nodeinfo, 'keyring') {
+               include roles::keyring
+       }
+
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
+       }
+
+       if getfromhash($site::nodeinfo, 'syncproxy') {
+               include roles::syncproxy
+       }
+
+       if getfromhash($site::nodeinfo, 'static_master') {
+               include roles::static_master
+       }
+
+       if getfromhash($site::nodeinfo, 'static_mirror') {
+               include roles::static_mirror
+       } elsif getfromhash($site::nodeinfo, 'static_source') {
+               include roles::static_source
+       }
+
+       if getfromhash($site::nodeinfo, 'weblog_provider') {
+               include roles::weblog_provider
+       }
+
+       if getfromhash($site::nodeinfo, 'mailrelay') {
+               include roles::mailrelay
+       }
+
+       if getfromhash($site::nodeinfo, 'pubsub') {
+               include roles::pubsub
+       }
+
+       if $::hostname in [ravel] {
+               include roles::weblog_destination
+       }
+
+       if $::hostname in [vento] {
+               ssl::service { 'vote.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [soler] {
+               ssl::service { 'security-tracker.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [bendel] {
+               ssl::service { 'lists.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [reger] {
+               ssl::service { 'rt.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [diabelli] {
+               ssl::service { 'sso.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [ullmann] {
+               ssl::service { 'udd.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+       
+       if $::hostname in [wuiet] {
+               ssl::service { 'buildd.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [pejacevic] {
+               ssl::service { 'piuparts.debian.org':
+                       notify => Service['apache2'],
+               }
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if $::hostname in [nono] {
+               ssl::service { 'nm.debian.org':
+                       notify => Service['apache2'],
+               }
+               ssl::service { 'contributors.debian.org':
+                       notify => Service['apache2'],
+               }
        }
 }