diff options
| author | varac <varacanero@zeromail.org> | 2012-10-12 22:07:19 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-10-12 22:07:19 +0200 |
| commit | 3e11ce4c43282448b032f9ad8e31667fb4b85ccb (patch) | |
| tree | 3bc95d3d627d00fbf496b157ec3a3593821b1879 /puppet/hiera.yaml | |
| parent | b8f727635254453503bd1d9b22e20d69cc23630a (diff) | |
| parent | 0eff2049fa8d846dffee3236824b8bc42e581467 (diff) | |
Merge branch 'feature/eip' into develop
Diffstat (limited to 'puppet/hiera.yaml')
| -rw-r--r-- | puppet/hiera.yaml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml index a992c057..4194c6c9 100644 --- a/puppet/hiera.yaml +++ b/puppet/hiera.yaml @@ -6,18 +6,20 @@ :logger: console :hierarchy: - - hosts/%{fqdn} - - ca/%{fqdn} - - ca/defaults - - eip/%{fqdn} - - eip/defaults + - %{fqdn} +#former hierarchy, not used anymore +# - hosts/%{fqdn} +# - ca/%{fqdn} +# - ca/defaults +# - eip/%{fqdn} +# - eip/defaults # more services following - - defaults +# - 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: ../config :puppet: :datasource: data |