Merge "Fix hiera paths when configuring puppet"

This commit is contained in:
Jenkins 2016-02-25 22:28:18 +00:00 committed by Gerrit Code Review
commit 54fabcffd1
2 changed files with 4 additions and 4 deletions

View File

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

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: