Load named::geodns from roles/manifests/init.pp based on hiera instead of from site...

diff --git a/manifests/site.pp b/manifests/site.pp
index 2933d23..b735738 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -77,10 +77,6 @@ node default {
                include apache2
        }
 
-       if $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
-       }
-
        if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fbd564b..51f9be5 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -161,6 +161,10 @@ class roles {
                include named::primary
        }
 
+       if has_role('dns_geo') {
+               include named::geodns
+       }
+
        if has_role('weblog_destination') {
                include roles::weblog_destination
        }