Skip to content

Hiera 5 support #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kpaulisse merged 2 commits into from
Oct 18, 2017
Merged

Hiera 5 support #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f82d532
Don't update a nil value
kpaulisse Oct 15, 2017
c5bef82
Merge branch 'master' into kpaulisse-hiera-5
kpaulisse Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/octocatalog-diff/catalog-util/builddir.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def install_ssl(logger, options)
# @param obj [Hash] Parsed hiera.yaml file
def update_hiera_config_v3(logger, options, obj)
([obj[:backends]].flatten || %w(yaml json)).each do |key|
next unless obj.key?(key.to_sym)
next unless obj.key?(key.to_sym) && !obj[key.to_sym][:datadir].nil?
obj[key.to_sym][:datadir] = hiera_munge(options, obj[key.to_sym][:datadir])

# Make sure the directory exists. If not, log a warning. This is *probably* a setup error, but we don't
Expand Down