Skip to content

Commit b5ae5e1

Browse files
committed
Update hiera yaml to version 5
1 parent 9e0a068 commit b5ae5e1

File tree

5 files changed

+27
-24
lines changed

5 files changed

+27
-24
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- stage: intake
3131
env:
3232
- TASK=intake
33-
- PUPPET_VERSION='~> 4.5.0'
33+
- PUPPET_VERSION='~> 4.10.0'
3434
- env:
3535
- TASK=intake
3636
- env:

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## x.x.x (Month Day, Year)
22

3+
### Migration Guide
4+
5+
#### Puppet < 4.10 No Longer Supported
6+
7+
Puppet 4.10.0 is the new minimum required version of Puppet.
8+
39
#### Fixes
410
* The Elasticsearch log directory is no longer recursively managed to avoid stomping on the user/mode settings that Elasticsearch prefers.
511
* Package management on apt-based systems no longer encounters dependency errors when `manage_repo => false`.

hiera.yaml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
---
2-
version: 4
3-
datadir: data
2+
version: 5
3+
4+
defaults:
5+
datadir: data
6+
data_hash: 'yaml_data'
7+
48
hierarchy:
5-
- name: "Distribution major version"
6-
backend: yaml
7-
path: "distro/%{facts.os.name}/%{facts.os.release.major}"
9+
- name: 'Distribution major version'
10+
path: 'distro/%{facts.os.name}/%{facts.os.release.major}.yaml'
811

9-
- name: "Operating system family major version"
10-
backend: yaml
11-
path: "os/%{facts.os.family}/%{facts.os.release.major}"
12+
- name: 'Operating system family major version'
13+
path: 'os/%{facts.os.family}/%{facts.os.release.major}.yaml'
1214

13-
- name: "Distribution name"
14-
backend: yaml
15-
path: "distro/%{facts.os.name}"
15+
- name: 'Distribution name'
16+
path: 'distro/%{facts.os.name}.yaml'
1617

17-
- name: "Operating system family"
18-
backend: yaml
19-
path: "os/%{facts.os.family}"
18+
- name: 'Operating system family'
19+
path: 'os/%{facts.os.family}.yaml'
2020

21-
- name: "System kernel"
22-
backend: yaml
23-
path: "kernel/%{facts.kernel}"
21+
- name: 'System kernel'
22+
path: 'kernel/%{facts.kernel}.yaml'
2423

25-
- name: "Default values"
26-
backend: yaml
27-
path: "common"
24+
- name: 'Default values'
25+
path: 'common.yaml'

metadata.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"description": "Module for managing and configuring Elasticsearch nodes",
99
"project_page": "https://github.com/elastic/puppet-elasticsearch",
1010
"issues_url": "https://github.com/elastic/puppet-elasticsearch/issues",
11-
"data_provider": "hiera",
1211
"dependencies": [
1312
{
1413
"name": "elastic/elastic_stack",
@@ -87,7 +86,7 @@
8786
"requirements": [
8887
{
8988
"name": "puppet",
90-
"version_requirement": ">= 4.5.0 < 6.0.0"
89+
"version_requirement": ">= 4.10.0 < 6.0.0"
9190
}
9291
]
9392
}

spec/matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OS:
1313
PUPPET_VERSION:
1414
- ""
1515
- "~> 5.0"
16-
- "~> 4.5.0"
16+
- "~> 4.10.0"
1717
TEST_TYPE:
1818
- latest
1919
- 5.6.9

0 commit comments

Comments
 (0)