Make a roles::dns_geodns

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 141cd49..d9684f3 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -65,6 +65,4 @@ class named::geodns inherits named {
                description => 'Allow nameserver access',
                rule        => '&TCP_UDP_SERVICE(53)'
        }
-
-       ssh::keygen { 'geodnssync': }
 }

diff --git a/modules/roles/manifests/dns_geodns.pp b/modules/roles/manifests/dns_geodns.pp
new file mode 100644 (file)
index 0000000..48bb916
--- /dev/null
+++ b/modules/roles/manifests/dns_geodns.pp
@@ -0,0 +1,6 @@
+# the geodns noes
+class roles::dns_geodns {
+  include named::geodns
+
+  ssh::keygen { 'geodnssync': }
+}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8c976f7..da2855b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -157,7 +157,7 @@ class roles {
        }
 
        if has_role('dns_geo') {
-               include named::geodns
+               include roles::dns_geodns
        }
 
        if has_role('weblog_destination') {