From 437433ff44cd77915a4a7b1d61d7aa624c44b41a Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Mon, 3 Aug 2015 14:44:35 -0700
Subject: [PATCH] Remove hiera.yaml and instead manage it with puppet code

Added hunner/hiera to the Puppetfile and a manifest to use it
instead of placing a hiera.yaml in the repo.
---
 Puppetfile                             |  5 +++++
 hiera.yaml                             |  9 ---------
 site/profile/manifests/puppetmaster.pp | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)
 delete mode 100644 hiera.yaml
 create mode 100644 site/profile/manifests/puppetmaster.pp

diff --git a/Puppetfile b/Puppetfile
index bba46dd..fde9831 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -15,6 +15,11 @@ mod "saz/ssh", :latest
 
 # Modules from Github using various references
 # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+# update the tag to the most current release when implementing
+mod 'hiera',
+  :git => 'https://github.com/hunner/puppet-hiera',
+  :tag => '1.3.1'
+
 #mod 'notifyme',
 #  :git => 'git://github.com/glarizza/puppet-notifyme',
 #  :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f'
diff --git a/hiera.yaml b/hiera.yaml
deleted file mode 100644
index bc98555..0000000
--- a/hiera.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-:backends:
-  - yaml
-:hierarchy:
-  - "nodes/%{clientcert}"
-  - common
-
-:yaml:
-  :datadir: "/etc/puppetlabs/puppet/environments/%{environment}/hieradata"
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
new file mode 100644
index 0000000..8242110
--- /dev/null
+++ b/site/profile/manifests/puppetmaster.pp
@@ -0,0 +1,14 @@
+class profile::puppetmaster {
+
+  class { 'hiera':
+    hierarchy  => [
+      "nodes/%{::trusted.certname}",
+      :common",
+    ],
+    hiera_yaml => '/etc/puppetlabs/code/hiera.yaml',
+    datadir    => "/etc/puppetlabs/code/environments/%{environment}/hieradata",
+    owner      => 'root',
+    group      => 'root',
+  }
+  
+}