From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 7 Jul 2019 08:51:39 +0000 (+0200)
Subject: Load named::geodns from roles/manifests/init.pp based on hiera instead of from site... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=e4818dbab72dc4aaeb120b3dbae082f99f8b83d7

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2933d23fa..b735738c2 100644
--- 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 fbd564b79..51f9be53d 100644
--- 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
 	}