From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 30 May 2014 00:48:05 +0000 (-0300)
Subject: Hiera fixes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d0fe80d76297c7250e90ae0fdacf0cc5c27a3fce;p=puppet-bootstrap.git

Hiera fixes
---

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