diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-05-29 21:48:05 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-05-29 21:48:05 -0300 |
| commit | d0fe80d76297c7250e90ae0fdacf0cc5c27a3fce (patch) | |
| tree | 9fecbb59b66eb95943c6b353a91eab308e14fc78 | |
| parent | f089058c408cdff55308107c686c22e1e714d533 (diff) | |
| download | puppet-bootstrap-d0fe80d76297c7250e90ae0fdacf0cc5c27a3fce.tar.gz puppet-bootstrap-d0fe80d76297c7250e90ae0fdacf0cc5c27a3fce.tar.bz2 | |
Hiera fixes
| -rw-r--r-- | hiera/hiera.yaml | 6 | ||||
| l--------- | manifests/hiera | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml index c911f2e..0a23dec 100644 --- a/hiera/hiera.yaml +++ b/hiera/hiera.yaml @@ -2,6 +2,10 @@ :backends: - yaml :yaml: + # Right now vagrant and puppet are not fully supporting + # a relative datadir. For it to work, we were forced to + # create a manifests/hiera symlink. This should be + # reconsidered in the future. :datadir: hiera :hierarchy: - '%{::environment}/domain/%{::domain}/node/%{::clientcert}' @@ -11,5 +15,5 @@ - '%{::environment}/location/%{::location}' - '%{::environment}/virtual/%{::virtual}' - '%{::environment}/role/%{::role}' - - common - bootstrap + - common diff --git a/manifests/hiera b/manifests/hiera new file mode 120000 index 0000000..ba8aae1 --- /dev/null +++ b/manifests/hiera @@ -0,0 +1 @@ +../hiera
\ No newline at end of file |