From 1d55cd96ce1d593fc8a0d11abdbdaafd951ec761 Mon Sep 17 00:00:00 2001
From: "christopher.lawrence" <chris.lawrence@puppet.com>
Date: Tue, 4 Feb 2020 14:45:29 +0000
Subject: [PATCH] added hiera data for nameservers and configured resolv
 profile

---
 data/common.yaml                              |  7 ++++++-
 site-modules/profile/manifests/base.pp        |  6 +++---
 site-modules/profile/manifests/base/resolv.pp | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 site-modules/profile/manifests/base/resolv.pp

diff --git a/data/common.yaml b/data/common.yaml
index 98458dd..65e0f5a 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,3 +1,8 @@
 ---
 message: "This node is using common data"
-profiles::base::dns::nameservers: 8.8.8.8
+
+profile::base::resolv: true
+profile::base::resolv::nameservers: 
+  - '8.8.8.8'
+  - '127.0.0.1'
+profile::base::resolv::domainname: home
diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
index da292a7..67d2009 100644
--- a/site-modules/profile/manifests/base.pp
+++ b/site-modules/profile/manifests/base.pp
@@ -4,7 +4,7 @@ class profile::base (
   Boolean $ntp      = false,
   Boolean $puppet   = false,
   Boolean $repos    = false,
-  Boolean $resolver = false,
+  Boolean $resolv   = false,
   Boolean $ssh      = true,
   Boolean $selinux  = true,
   Boolean $motd     = true,
@@ -27,8 +27,8 @@ class profile::base (
   if $repos {
     class { '::profile::base::repositories': }
   }
-  if $resolver {
-    class { '::profile::base::resolver': }
+  if $resolv {
+    class { '::profile::base::resolv': }
   }
   if $ssh {
     class { '::profile::base::ssh': }
diff --git a/site-modules/profile/manifests/base/resolv.pp b/site-modules/profile/manifests/base/resolv.pp
new file mode 100644
index 0000000..b22a9c0
--- /dev/null
+++ b/site-modules/profile/manifests/base/resolv.pp
@@ -0,0 +1,17 @@
+# This class can be used to configure resolv.conf.
+#
+# @example when declaring the resolver class
+#  class { '::profiles::base::resolv': }
+#
+class profile::base::resolv (
+  Optional[String] $domainname = undef,
+  Array[String] $nameservers = [],
+  Optional[String] $searchpath = undef,
+) {
+
+  class { '::resolv_conf':
+    domainname  => $domainname,
+    nameservers => $nameservers,
+    searchpath  => $searchpath,
+  }
+}