From c255a6a8772684397f545a560119428ac44993ca Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 20 Sep 2012 11:49:00 +0200
Subject: use relative path, hieradata outline

---
 puppet/hiera.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
index 01b0d3b8..76584ad1 100644
--- a/puppet/hiera.yaml
+++ b/puppet/hiera.yaml
@@ -6,11 +6,14 @@
 :logger: console
 
 :hierarchy:
-  - "%{location}"
-  - common
+  - hosts/%{fqdn}
+  - services/%{service}
+  - defaults
 
+# relative from where puppet is run, so we need to run puppet 
+# from the root dir of the leap_platform repo
 :yaml:
-   :datadir: /etc/leap/hieradata
+   :datadir: config
 
 :puppet:
    :datasource: data
-- 
cgit v1.2.3