Skip to content

hiera_yaml_file -> hiera_config everywhere #15

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 1 commit into from
Nov 3, 2016
Merged

hiera_yaml_file -> hiera_config everywhere #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 doc/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

To be minimally functional, you will almost certainly need to define at least the following settings:

- `settings[:hiera_yaml_file]` as the absolute or relative path to your hiera configuration file
- `settings[:hiera_config]` as the absolute or relative path to your hiera configuration file
- `settings[:hiera_path_strip]` as the prefix to strip when munging the hiera configuration file
- `settings[:puppetdb_url]` as the URL to your PuppetDB instance so facts can be obtained

Expand Down
6 changes: 3 additions & 3 deletions examples/octocatalog-diff.cfg.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ def self.config
settings = {}

##############################################################################################
# hiera_yaml_file
# hiera_config
# Path to the hiera.yaml configuration file. If the path starts with a `/`, then it is
# treated as an absolute path on this system. Otherwise, the path will be treated as
# a relative path. If you don't specify this, the tool will assume you aren't using Hiera.
# More: https://github.com/github/octocatalog-diff/blob/master/doc/configuration-hiera.md
##############################################################################################

# settings[:hiera_yaml_file] = '/etc/puppetlabs/puppet/hiera.yaml' # Absolute path
# settings[:hiera_yaml_file] = 'environments/production/config/hiera.yaml' # Relative path
# settings[:hiera_config] = '/etc/puppetlabs/puppet/hiera.yaml' # Absolute path
# settings[:hiera_config] = 'environments/production/config/hiera.yaml' # Relative path

##############################################################################################
# hiera_path_strip
Expand Down