summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-09-20 11:49:00 +0200
committervarac <varacanero@zeromail.org>2012-09-20 11:49:00 +0200
commitc255a6a8772684397f545a560119428ac44993ca (patch)
tree6e7fe7e96026ceeaf13bdb8882126e81496baf0e /puppet
parentbdfcfbb8702748ab013190b0116735fe56f7531e (diff)
use relative path, hieradata outline
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hiera.yaml9
1 files 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