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 1f2c21631e0b994988a030ad91f529f3870a72d0..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
        }
 
@@ -14,9 +16,6 @@ class roles {
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
-               ssl::service { 'buildd.debian.org':
-                       notify => Service['apache2'],
-               }
        }
 
        if getfromhash($site::nodeinfo, 'porterbox') {
@@ -95,6 +94,12 @@ class roles {
                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'],
@@ -107,11 +112,29 @@ class roles {
                }
        }
 
+       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':