Merge pull request #1010 from mayflower/hiera5

Update hiera yaml to version 5

Author: tylerjl

.travis.yml

@@ -30,7 +30,7 @@ jobs:
   - stage: intake
     env:
     - TASK=intake
-    - PUPPET_VERSION='~> 4.5.0'
+    - PUPPET_VERSION='~> 4.10.0'
   - env:
     - TASK=intake
   - env:

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.
+
 #### Fixes
 * The Elasticsearch log directory is no longer recursively managed to avoid stomping on the user/mode settings that Elasticsearch prefers.
 * Package management on apt-based systems no longer encounters dependency errors when `manage_repo => false`.

hiera.yaml

@@ -1,27 +1,25 @@
 ---
-version: 4
-datadir: data
+version: 5
+
+defaults:
+  datadir: data
+  data_hash: 'yaml_data'
+
 hierarchy:
-  - name: "Distribution major version"
-    backend: yaml
-    path: "distro/%{facts.os.name}/%{facts.os.release.major}"
+  - name: 'Distribution major version'
+    path: 'distro/%{facts.os.name}/%{facts.os.release.major}.yaml'
 
-  - name: "Operating system family major version"
-    backend: yaml
-    path: "os/%{facts.os.family}/%{facts.os.release.major}"
+  - name: 'Operating system family major version'
+    path: 'os/%{facts.os.family}/%{facts.os.release.major}.yaml'
 
-  - name: "Distribution name"
-    backend: yaml
-    path: "distro/%{facts.os.name}"
+  - name: 'Distribution name'
+    path: 'distro/%{facts.os.name}.yaml'
 
-  - name: "Operating system family"
-    backend: yaml
-    path: "os/%{facts.os.family}"
+  - name: 'Operating system family'
+    path: 'os/%{facts.os.family}.yaml'
 
-  - name: "System kernel"
-    backend: yaml
-    path: "kernel/%{facts.kernel}"
+  - name: 'System kernel'
+    path: 'kernel/%{facts.kernel}.yaml'
 
-  - name: "Default values"
-    backend: yaml
-    path: "common"
+  - name: 'Default values'
+    path: 'common.yaml'

metadata.json

@@ -8,7 +8,6 @@
   "description": "Module for managing and configuring Elasticsearch nodes",
   "project_page": "https://github.com/elastic/puppet-elasticsearch",
   "issues_url": "https://github.com/elastic/puppet-elasticsearch/issues",
-  "data_provider": "hiera",
   "dependencies": [
     {
       "name": "elastic/elastic_stack",
@@ -87,7 +86,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.5.0 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 6.0.0"
     }
   ]
 }

spec/matrix.yml

@@ -13,7 +13,7 @@ OS:
 PUPPET_VERSION:
   - ""
   - "~> 5.0"
-  - "~> 4.5.0"
+  - "~> 4.10.0"
 TEST_TYPE:
   - latest
   - 5.6.9