From c2faa35b176b7bf36f7f7cad1ba3ae9395d335f4 Mon Sep 17 00:00:00 2001
From: "christopher.lawrence" <chris.lawrence@puppet.com>
Date: Wed, 5 Feb 2020 15:42:05 +0000
Subject: [PATCH] adding in the ntp server hiera data

---
 data/common.yaml                            |  6 +++++-
 site-modules/profile/manifests/base.pp      | 12 ++----------
 site-modules/profile/manifests/base/time.pp | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 site-modules/profile/manifests/base/time.pp

diff --git a/data/common.yaml b/data/common.yaml
index 37b8c43..5de80e2 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,9 +1,13 @@
 ---
 message: "This node is using common data"
-
 profile::base::resolv: true
 profile::base::resolv::nameservers: 
   - '8.8.8.8'
   - '127.0.0.1'
 profile::base::resolv::domainname: home
 profile::base::selinux::mode: permissive
+profile::base::time: true
+profile::base::time::ntp_servers:
+  - 0.uk.pool.ntp.org
+  - 1.uk.pool.ntp.org
+  - 2.uk.pool.ntp.org
diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp
index 67d2009..6656b94 100644
--- a/site-modules/profile/manifests/base.pp
+++ b/site-modules/profile/manifests/base.pp
@@ -1,8 +1,6 @@
 class profile::base (
   Boolean $firewall = false,
-  Boolean $lvm      = false,
-  Boolean $ntp      = false,
-  Boolean $puppet   = false,
+  Boolean $time     = false,
   Boolean $repos    = false,
   Boolean $resolv   = false,
   Boolean $ssh      = true,
@@ -15,15 +13,9 @@ class profile::base (
   if $firewall {
     class { '::profile::base::firewall': }
   }
-  if $lvm {
-    class { '::profile::base::lvm': }
-  }
-  if $ntp {
+  if $time {
     class { '::profile::base::time': }
   }
-  if $puppet {
-    class { '::profile::base::puppet': }
-  }
   if $repos {
     class { '::profile::base::repositories': }
   }
diff --git a/site-modules/profile/manifests/base/time.pp b/site-modules/profile/manifests/base/time.pp
new file mode 100644
index 0000000..93fc3a9
--- /dev/null
+++ b/site-modules/profile/manifests/base/time.pp
@@ -0,0 +1,16 @@
+class profile::base::time (
+  String $default_timezone = 'Europe/London',
+  Array $ntp_servers       = [],
+  Array $restrict          = [],
+  Boolean $set_timezone    = false,
+) {
+  class { '::ntp':
+    servers  => $ntp_servers,
+    restrict => $restrict,
+  }
+  if $set_timezone {
+    class { '::timezone':
+      default_timezone => $default_timezone,
+    }
+  }
+}