diff options
| author | varac <varacanero@zeromail.org> | 2012-10-30 15:03:55 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-10-30 15:03:55 +0100 |
| commit | f066f7a99a8d15f5b80c5bbf9117606c723ab352 (patch) | |
| tree | 961439bb37e8fa8442759987c0dcad0369145ed7 /puppet/hiera.yaml | |
| parent | 06a1546a36698dd75fb500ad2a12e9bbf9b43f03 (diff) | |
| parent | 9586f6ec95b6bdba7ca3df4135055f2cced9e972 (diff) | |
Merge branch 'develop' into feature/couchdb
Diffstat (limited to 'puppet/hiera.yaml')
| -rw-r--r-- | puppet/hiera.yaml | 19 |
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 |