Skip to content

Commit 07f4c24

Browse files
committed
Clarify that this refers to a global hiera.yaml
1 parent 49e3f45 commit 07f4c24

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

doc/configuration-hiera.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Before you start, please understand how octocatalog-diff compiles a catalog:
2626
- It compiles the catalog, based on the temporary directory, for environment=production
2727
- It removes the temporary directory
2828

29-
### Configuring the location of hiera.yaml
29+
### Configuring the location of global hiera.yaml
3030

31-
The command line option `--hiera-config PATH` allows you to set the path to hiera.yaml.
31+
The command line option `--hiera-config PATH` allows you to set the path to the global hiera.yaml.
3232

3333
You may specify this as either an absolute or a relative path.
3434

@@ -40,12 +40,9 @@ You may specify this as either an absolute or a relative path.
4040
bin/octocatalog-diff --hiera-config hiera.yaml ...
4141
```
4242
43-
The path is relative to a checkout of your Puppet repository. With the setting above, it will use the file named `hiera.yaml` that is at the top level
44-
of your Puppet checkout.
43+
The path is relative to a checkout of your Puppet repository. With the setting above, it will use the file named `hiera.yaml` that is at the top level of your Puppet checkout.
4544
46-
Perhaps your hiera.yaml file is in a subdirectory of your Puppet checkout. In that case, just use the relative directory path. Be sure not to add a leading `/` though,
47-
because you don't want octocatalog-diff to treat it as an absolute path. In the following example, suppose you have a top level directory called `config` and your
48-
`hiera.yaml` file is contained within it. You could then use:
45+
Perhaps your hiera.yaml file is in a subdirectory of your Puppet checkout. In that case, just use the relative directory path. Be sure not to add a leading `/` though, because you don't want octocatalog-diff to treat it as an absolute path. In the following example, suppose you have a top level directory called `config` and your `hiera.yaml` file is contained within it. You could then use:
4946
5047
```
5148
bin/octocatalog-diff --hiera-config config/hiera.yaml ...

0 commit comments

Comments
 (0)