opendev
/
ansible-role-puppet
Code Issues Proposed changes

Fix hiera paths when configuring puppet 

The path to hiera was wrong, as long with the subdirectories

Change-Id: I66873aa63fe6bb4ab68b5be7ae14a06479c5bfbc
This commit is contained in:
Yolanda Robla 2016-02-25 22:39:30 +01:00
parent ec4e488890
commit 8255eecc9b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -12,5 +12,5 @@ puppet_data_binding_terminus: hiera
puppet_reports: store
puppet_basemodulepath: '$confdir/modules:/usr/share/puppet/modules'
puppet_environmentpath: '$confdir/environments'
puppet_hiera_datadir: '/etc/puppet/hieradata'
puppet_hiera_datadir: '/opt/system-config/'
puppet_environment: production

6
templates/hiera.yaml.j2
View File

@ -5,9 +5,9 @@
- "hieradata/%{::environment}/group/%{group}" # no :: because group is set at nodescope
- "hieradata/%{::environment}/common"
# Use public hieradata second, also be environmentally aware
- "%{::environment}/fqdn/%{::fqdn}"
- "%{::environment}/group/%{group}" # no :: because group is set at nodescope
- "%{::environment}/common"
- "%{::environment}/hiera/fqdn/%{::fqdn}"
- "%{::environment}/hiera/group/%{group}" # no :: because group is set at nodescope
- "%{::environment}/hiera/common"
:backends:
- yaml
:yaml: