Hiera fixes

diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
index c911f2e6a305744f5dc9d251ac7ea4cd055cb052..0a23dec504a0d8840bbd0aa437ffd2b2cb2994bd 100644 (file)
--- 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 (symlink)
index 0000000..ba8aae1
--- /dev/null
+++ b/manifests/hiera
@@ -0,0 +1 @@
+../hiera
\ No newline at end of file