saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add PER_REMOTE_ONLY to init_remotes call in git_pillar runner

Browse source 
When the mountpoint feature was added, it added a per-remote-only
parameter called `mountpoint`. While this is reflected in
salt.pillar.git_pillar, it was not in salt.runners.git_pillar. This
corrects that oversight, fixing a traceback when the `git_pillar.update`
runner is executed and one or more remotes have a `mountpoint` parameter
configured.
This commit is contained in:
Erik Johnson 2017-07-24 08:50:44 -05:00
parent 81695a9f3c
commit 6352f447ce
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/runners/git_pillar.py
View file

@ -86,7 +86,8 @@ def update(branch=None, repo=None):
else:
pillar = salt.utils.gitfs.GitPillar(__opts__)
pillar.init_remotes(pillar_conf,
salt.pillar.git_pillar.PER_REMOTE_OVERRIDES)
salt.pillar.git_pillar.PER_REMOTE_OVERRIDES,
salt.pillar.git_pillar.PER_REMOTE_ONLY)
for remote in pillar.remotes:
# Skip this remote if it doesn't match the search criteria
if branch is not None: