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 29beab5c077faee0d6c00a5da54e7670a3e90e8a..81b668fde39d59ed624f78c5b5c72cebf0396fa8 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,11 +34,14 @@ 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
        }
 
-       if has_role('apache2_www_mirror') {
+
+        # XXX: turn this into a real role
+        if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
                include roles::www_mirror
        }