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

Merge pull request #42211 from terminalmage/issue40928

Browse source 
Only pass a saltenv in orchestration if one was explicitly passed (2016.11)
This commit is contained in:
Nicole Thomas 2017-07-07 14:16:34 -06:00 • committed by GitHub
commit 274946ab00
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/states/saltmod.py
View file

@ -73,6 +73,7 @@ def state(
saltenv=None,
test=False,
pillar=None,
pillarenv=None,
expect_minions=False,
fail_minions=None,
allow_fail=0,
@ -230,7 +231,12 @@ def state(
if pillar:
cmd_kw['kwarg']['pillar'] = pillar
cmd_kw['kwarg']['saltenv'] = saltenv if saltenv is not None else __env__
if pillarenv is not None:
cmd_kw['kwarg']['pillarenv'] = pillarenv
if saltenv is not None:
cmd_kw['kwarg']['saltenv'] = saltenv
cmd_kw['kwarg']['queue'] = queue
if isinstance(concurrent, bool):