Add some debug logging for git_pillar

This adds logging showing which directory and which environment are
being processed for each pillar_dir being evaluated.
This commit is contained in:
Erik Johnson 2015-11-20 01:18:20 -06:00
parent fac588c0bb
commit 1cd9a4d1b4

View file

@ -261,7 +261,14 @@ def ext_pillar(minion_id, repo, pillar_dirs):
'smart'
)
for pillar_dir, env in six.iteritems(pillar.pillar_dirs):
opts['pillar_roots'] = {env: [d for (d, e) in six.iteritems(pillar.pillar_dirs) if env == e]}
log.debug(
'git_pillar is processing pillar SLS from {0} for pillar '
'env \'{1}\''.format(pillar_dir, env)
)
opts['pillar_roots'] = {
env: [d for (d, e) in six.iteritems(pillar.pillar_dirs)
if env == e]
}
local_pillar = Pillar(opts, __grains__, minion_id, env)
ret = salt.utils.dictupdate.merge(
ret,