From 05782aa78f6dcb377b203ac3378ea3fdeae72601 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Wed, 14 Oct 2015 09:08:48 +0200 Subject: [PATCH] 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 --- salt/pillar/git_pillar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/pillar/git_pillar.py b/salt/pillar/git_pillar.py index 67aa924c28..1589d2ad08 100644 --- a/salt/pillar/git_pillar.py +++ b/salt/pillar/git_pillar.py @@ -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,