Showing with 23 additions and 8 deletions.
  1. +11 −0 CHANGELOG.md
  2. +1 −1 manifests/deep_merge.pp
  3. +1 −1 manifests/eyaml.pp
  4. +1 −1 manifests/eyaml_gpg.pp
  5. +3 −0 manifests/init.pp
  6. +2 −2 metadata.json
  7. +4 −3 spec/classes/hiera_spec.rb
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v3.3.0](https://github.com/voxpupuli/puppet-hiera/tree/v3.3.0) (2017-10-15)
[Full Changelog](https://github.com/voxpupuli/puppet-hiera/compare/v3.2.0...v3.3.0)

**Implemented enhancements:**

- Allow eyaml, eyaml\_gpg and deep\_merge packages to be installed independent of hiera package [\#208](https://github.com/voxpupuli/puppet-hiera/pull/208) ([treydock](https://github.com/treydock))

## [v3.2.0](https://github.com/voxpupuli/puppet-hiera/tree/v3.2.0) (2017-09-17)
[Full Changelog](https://github.com/voxpupuli/puppet-hiera/compare/v3.1.0...v3.2.0)

Expand All @@ -15,6 +22,10 @@ These should not affect the functionality of the module.

- Release new tag incorporating \#197, \#200 [\#202](https://github.com/voxpupuli/puppet-hiera/issues/202)

**Merged pull requests:**

- Release 3.2.0 [\#207](https://github.com/voxpupuli/puppet-hiera/pull/207) ([bastelfreak](https://github.com/bastelfreak))

## [v3.1.0](https://github.com/voxpupuli/puppet-hiera/tree/v3.1.0) (2017-08-31)
[Full Changelog](https://github.com/voxpupuli/puppet-hiera/compare/v3.0.0...v3.1.0)

Expand Down
2 changes: 1 addition & 1 deletion manifests/deep_merge.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
$deep_merge_version = $::hiera::deep_merge_version
$deep_merge_source = $::hiera::deep_merge_source
$deep_merge_name = $::hiera::deep_merge_name
$manage_package = $::hiera::manage_package
$manage_package = $::hiera::manage_deep_merge_package

if $manage_package {
::hiera::install { 'deep_merge':
Expand Down
2 changes: 1 addition & 1 deletion manifests/eyaml.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
$create_keys = $::hiera::create_keys
$_keysdir = $::hiera::_keysdir

$manage_package = $::hiera::manage_package
$manage_package = $::hiera::manage_eyaml_package

if $manage_package {
::hiera::install { 'eyaml':
Expand Down
2 changes: 1 addition & 1 deletion manifests/eyaml_gpg.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
$cmdpath = $::hiera::cmdpath
$_keysdir = $::hiera::_keysdir

$manage_package = $::hiera::manage_package
$manage_package = $::hiera::manage_eyaml_gpg_package

require ::hiera::eyaml

Expand Down
3 changes: 3 additions & 0 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@
$extra_config = '',
$master_service = $::hiera::params::master_service,
$manage_package = $::hiera::params::manage_package,
Boolean $manage_eyaml_package = true,
Boolean $manage_deep_merge_package = true,
Boolean $manage_eyaml_gpg_package = true,
$package_name = $::hiera::params::package_name,
$package_ensure = $::hiera::params::package_ensure,
$eyaml_gpg_name = 'hiera-eyaml-gpg',
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-hiera",
"version": "3.2.0",
"version": "3.3.0",
"author": "Vox Pupuli",
"summary": "Deploy hiera.yaml with hierarchy, and datadir",
"license": "Apache-2.0",
Expand Down Expand Up @@ -53,7 +53,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.7.1 < 5.0.0"
"version_requirement": ">= 4.7.1 < 6.0.0"
}
]
}
7 changes: 4 additions & 3 deletions spec/classes/hiera_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,10 @@
end

it { is_expected.to compile }
it { is_expected.not_to contain_hiera__install('eyaml') }
it { is_expected.not_to contain_hiera__install('ruby_gpg') }
it { is_expected.not_to contain_hiera__install('hiera-eyaml-gpg') }
it { is_expected.not_to contain_package('hiera') }
it { is_expected.to contain_hiera__install('eyaml') }
it { is_expected.to contain_hiera__install('ruby_gpg') }
it { is_expected.to contain_hiera__install('hiera-eyaml-gpg') }
it { is_expected.to contain_exec('createkeys').that_requires('File[/etc/keys]') }
end
describe 'param manage_package => true and create_keys => true' do
Expand Down