Move dns_zones to hiera.

1 files changed, 6 insertions, 22 deletions

diff --git a/manifests/dns_zones.pp b/manifests/dns_zones.pp
index e66a996..1ce636a 100644
--- a/manifests/dns_zones.pp
+++ b/manifests/dns_zones.pp
@@ -6,6 +6,8 @@ class profiles::dns_zones (
   Optional[Hash] $views = undef,
   Hash $view_defaults = {},
   String $default_view = '_GLOBAL_',
+  Hash $zonedata_default = {},
+  Hash[String,Hash] $zonedata = {},
 ) {
 
   if $views != undef {
@@ -17,12 +19,11 @@ class profiles::dns_zones (
 
   create_resources(dns::zone, $zones, $default)
 
-  [$_, $rev_zone] = dns_record::rev_record(
-    $facts['networking']['ip6'],
-    $facts['networking']['netmask6'])
+  create_resources(dns_zone, $zonedata, $zonedata_default)
 
-  Dns_record <<| zone == 'adrift.space' |>>
-  Dns_record <<| zone == $rev_zone |>>
+  $zonedata.each |$zone, $_| {
+    Dns_record <<| zone == $zone |>>
+  }
 
   $zone_hash = Hash(lookup('dns_zones."adrift.space"').map |$d| {
     ["adrift.space ${d['type']} ${d['key']} ${d['value']}", $d]
@@ -34,21 +35,4 @@ class profiles::dns_zones (
     # 'notify'   => Dns_zone['adrift.space'],
     })
 
-  dns_zone { default:
-    primary        => 'ns1.adrift.space.',
-    email          => 'hugo.hornquist.se.',
-    soa_refresh    => '2w',
-    negative_ttl   => '300', ;
-  'adrift.space':
-    ns             => [
-      'ns1',
-      'ns2',
-      ], ;
-    $rev_zone:
-      ns => [
-        'ns1.adrift.space.',
-        'ns2.adrift.space.',
-      ]
-  }
-
 }