Skip to content

Issues 22646, 22647, 22648 data-in-modules simplification#1957

Closed
hlindberg wants to merge 7 commits intopuppetlabs:masterfrom
hlindberg:issue-22646-simplify-structure
Closed

Issues 22646, 22647, 22648 data-in-modules simplification#1957
hlindberg wants to merge 7 commits intopuppetlabs:masterfrom
hlindberg:issue-22646-simplify-structure

Conversation

@hlindberg
Copy link
Contributor

This contains fixes for Redmine issues 22646, 22647, 22648

  • Simplify hiera.yaml and binder_config.yaml
  • Add smart defaults
  • Support private / nested hierarchies

The boundaries between the issues somewhat blurred, all commits marked with 22646.

Overview of what the simplifications are is found here: https://github.com/hlindberg/misc-puppet-docs/blob/master/improvements-arm-9.md

This adds the basic attributes and defaults to the Hiera2::Config class
to support the simpler configuration described in issue 22646).
This modifies the hiera2 config checker to use a specific checker
for version 2 and 3. The config selects the checker.

Testfixtures moved to version 2 specific folder.
Tests updated to load from the version 2 fixtures, and also
expect there to be a deprecation warning.

Tests for version 3 remains to be written.
This adds testing of hiera-2 hiera.yaml using version 3.
It also adds the issues introduced by the version 3 checker, and
corrects several issues in the checker implementation.

Fixture data reorganized (remove one level in the directory structure
and making it easier to remove support for version 2 data in the future.
This adds fixtures and more tests for hiera.yaml format 3.
- simple, same format as hiera1
- complex, more than one category, more than one path
This tests a hiera.yaml configuration that uses all defaults expect
category.
This commit makes it possible to specify the categories in
the binder_config.yaml using one of:

* a string (the category name, the value becomes '$name')
* an array [name, value]
* an object { name: 'name', value: 'value'}

If the value part is missing it automatically becomes '$name'.
Since a path, or paths may be located in a different location than
the common datadir that applies to all paths it is now possible to
set datadir for one entry in the hierarchy. This overrides the
datadir set at the top level.
@puppetcla
Copy link

CLA signed by all contributors.

@zaphod42
Copy link
Contributor

Since we are not going to be moving forward with this implementation, these changes aren't needed anymore.

@zaphod42 zaphod42 closed this Nov 13, 2013
@hlindberg hlindberg deleted the issue-22646-simplify-structure branch September 16, 2017 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants