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 6f62ca8fc83a34f99c9b99b02c3836b7898f2025..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
        }
 
@@ -88,20 +90,52 @@ class roles {
                include roles::pubsub
        }
 
-       if getfromhash($site::nodeinfo, 'buildd_master') {
-               include roles::buildd_master
-       }
-
        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'],