More workarounds

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f16846cfaf0e6aa69b723d2f15160e4e493f2725..e3e88aec44dc4ed586fb35a0fda7d3bbbfb8fba2 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -20,7 +20,8 @@ class roles {
                include buildd
        }
 
-       if has_role('porterbox') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'porterbox') {
                include porterbox
        }
 
@@ -33,7 +34,8 @@ class roles {
                include roles::dakmaster
        }
 
-       if has_role('apache2_security_mirror') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
                include roles::security_mirror
        }