Merge pull request #36 from mayflower/hiera5

Update hiera yaml to version 5
voxpupuli · Jan 15, 2019 · 154284f · 154284f
2 parents eec0641 + 1b45b6b
commit 154284f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ jobs:
    - stage: intake
      env:
      - TASK=test
-     - PUPPET_VERSION='~> 4.5.0'
+     - PUPPET_VERSION='~> 4.10.0'
    - env:
      - TASK=test
    - env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## x.x.x (Month Day, Year)
 
+### Migration Guide
+
+#### Puppet < 4.10 No Longer Supported
+
+Puppet 4.10.0 is the new minimum required version of Puppet.
+
 #### Features
 
 #### Fixes

diff --git a/hiera.yaml b/hiera.yaml
@@ -1,7 +1,10 @@
 ---
-version: 4
-datadir: data
+version: 5
+
+defaults:
+  datadir: data
+  data_hash: 'yaml_data'
+
 hierarchy:
-  - name: "Default values"
-    backend: yaml
-    path: "common"
+  - name: 'Default values'
+    path: 'common.yaml'
diff --git a/metadata.json b/metadata.json
@@ -7,7 +7,6 @@
   "source": "https://github.com/elastic/puppet-kibana",
   "project_page": "https://github.com/elastic/puppet-kibana",
   "issues_url": "https://github.com/elastic/puppet-kibana/issues",
-  "data_provider": "hiera",
   "dependencies": [
     {
       "name": "elastic/elastic_stack",
@@ -59,7 +58,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.5.0 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 6.0.0"
     }
   ]
 }