mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Provide all git pillar dirs in opts[pillar_roots]
Do not only provide the `pillar_roots` directory of the currently evaluated pillar SLS. This makes it impossible to use `include` for pillar SLS located in another git repository. Fixes #27932
This commit is contained in:
parent
286b08a0f5
commit
05782aa78f
@ -251,7 +251,7 @@ def ext_pillar(minion_id, repo, pillar_dirs):
|
||||
'smart'
|
||||
)
|
||||
for pillar_dir, env in six.iteritems(pillar.pillar_dirs):
|
||||
opts['pillar_roots'] = {env: [pillar_dir]}
|
||||
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,
|
||||
|
Loading…
Reference in New Issue
Block a user