From 8aa786e8bc5d6a7a16a7deab3224b4f66e6357bd Mon Sep 17 00:00:00 2001
From: jeff levesque <jeff1evesque@yahoo.com>
Date: Sun, 5 Mar 2017 13:11:56 -0500
Subject: [PATCH 1/4] #2928: hiera.yaml, change syntax to 'version 5'

---
 hiera.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/hiera.yaml b/hiera.yaml
index 73a4e1ab8..e291c092e 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,10 +1,13 @@
 ---
-:backends:
-  - yaml
+version: 5
 
-:yaml:
-  :datadir: /vagrant/hiera
+defaults:
+  datadir: /vagrant/hiera
+  data_hash: yaml_data
 
-:hierarchy:
-  - packages
+hierarchy:
+  - name: 'General build packages'
+    path: packages
+
+  - name: 'General application settings'
   - settings
\ No newline at end of file

From a08adbcfaa12278b983faf83299c7caa83d0de3f Mon Sep 17 00:00:00 2001
From: jeff levesque <jeff1evesque@yahoo.com>
Date: Sun, 5 Mar 2017 14:27:45 -0500
Subject: [PATCH 2/4] #2928: hiera.yaml, fix typo

---
 hiera.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hiera.yaml b/hiera.yaml
index e291c092e..42cfbae81 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -10,4 +10,4 @@ hierarchy:
     path: packages
 
   - name: 'General application settings'
-  - settings
\ No newline at end of file
+    path: settings
\ No newline at end of file

From 55584a8f272e75efb81ff9ed48e6ad5f560daa60 Mon Sep 17 00:00:00 2001
From: jeff levesque <jeff1evesque@yahoo.com>
Date: Sun, 5 Mar 2017 16:45:04 -0500
Subject: [PATCH 3/4] #2928: Vagrantfile, update puppetagent to '4.9.3'

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 88e591aef..8f6d3e339 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -46,7 +46,7 @@ Vagrant.configure(2) do |config|
   config.vm.box_download_checksum_type = 'md5'
 
   ## Ensure puppet installed within guest
-  config.puppet_install.puppet_version = '4.9.2'
+  config.puppet_install.puppet_version = '4.9.3'
 
   ## Create a forwarded port mapping which allows access to a specific port
   #  within the machine from a port on the host machine. In the example below,

From 51089c35398089a230acc4a4429495e3dd2dc391 Mon Sep 17 00:00:00 2001
From: jeff levesque <jeff1evesque@yahoo.com>
Date: Sun, 5 Mar 2017 17:42:27 -0500
Subject: [PATCH 4/4] #2928: hiera.yaml, add file extension for yaml files

---
 hiera.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hiera.yaml b/hiera.yaml
index 42cfbae81..58e53b7a3 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,13 +1,12 @@
 ---
 version: 5
-
 defaults:
   datadir: /vagrant/hiera
   data_hash: yaml_data
 
 hierarchy:
   - name: 'General build packages'
-    path: packages
+    path: packages.yaml
 
   - name: 'General application settings'
-    path: settings
\ No newline at end of file
+    path: settings.yaml
\ No newline at end of file