Skip to content

Commit 8e14d69

Browse files
authored
Merge pull request #15 from github/kpaulisse-document-hiera-correctly
hiera_yaml_file -> hiera_config everywhere
2 parents 83fc87e + 7dbab60 commit 8e14d69

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

doc/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
To be minimally functional, you will almost certainly need to define at least the following settings:
3232
33-
- `settings[:hiera_yaml_file]` as the absolute or relative path to your hiera configuration file
33+
- `settings[:hiera_config]` as the absolute or relative path to your hiera configuration file
3434
- `settings[:hiera_path_strip]` as the prefix to strip when munging the hiera configuration file
3535
- `settings[:puppetdb_url]` as the URL to your PuppetDB instance so facts can be obtained
3636

examples/octocatalog-diff.cfg.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ def self.config
2626
settings = {}
2727

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

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

3939
##############################################################################################
4040
# hiera_path_strip

0 commit comments

Comments
 (0)