opendev
/
ansible-role-puppet
Code Issues Proposed changes

Fix hieradata path for puppet 4 

The datadir symlink points to /opt/system-config, but the private
hieradata actually lies within /opt/system-config/hieradata.

Change-Id: Iefedf1d733701c7abebd5022ca98993c5fcbd8a3
This commit is contained in:
Colleen Murphy 2019-02-03 15:45:20 +01:00
parent 98b7ea710b
commit fe5255b56f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/hiera.yaml.j2
View File

@ -7,9 +7,9 @@
- "hieradata/%{::environment}/group_vars/%{group}" # no :: because group is set at nodescope
- "hieradata/%{::environment}/group_vars/all"
# Puppet4 paths
- "%{::environment}/hieradata/host_vars/%{::fqdn}"
- "%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope
- "%{::environment}/hieradata/group_vars/all"
- "hieradata/%{::environment}/hieradata/host_vars/%{::fqdn}"
- "hieradata/%{::environment}/hieradata/group_vars/%{group}" # no :: because group is set at nodescope
- "hieradata/%{::environment}/hieradata/group_vars/all"
# Use public hieradata second, also be environmentally aware. Keep this
# in the old structure so that we don't have to do a dance. There isn't much
# here, and it can be transferred piecemeal.