summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-24 18:25:49 +0200
committervarac <varacanero@zeromail.org>2012-10-24 18:25:49 +0200
commit69c456f5a16fa4484754a809ded93ddd554b1d16 (patch)
tree15eb24d5c596fa23c8b3c2158955b71492cb1fd0 /puppet
parentcaea416c370bd2f6aa4c012f4ca40ac312269ad1 (diff)
hiera config now in /etc/leap/hiera.yaml
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hiera.yaml19
1 files changed, 4 insertions, 15 deletions
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
index af448d57..93448e23 100644
--- a/puppet/hiera.yaml
+++ b/puppet/hiera.yaml
@@ -5,22 +5,11 @@
:logger: console
-:hierarchy:
- - %{fqdn}
- - defaults
-#former hierarchy, not used anymore
-# - hosts/%{fqdn}
-# - ca/%{fqdn}
-# - ca/defaults
-# - eip/%{fqdn}
-# - eip/defaults
-# more services following
-# - defaults
-
-# relative from where puppet is run, so we need to run puppet
-# from the root dir of the leap_platform repo
:yaml:
- :datadir: ../config
+ :datadir: /etc/leap
+:hierarchy:
+ - hiera
+
:puppet:
:datasource: data