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

don't override the minion config unless requested

Browse source
This commit is contained in:
Thomas S Hatch 2015-07-27 10:51:03 -06:00
parent 26c858361c
commit 65d6ec0659
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/modules/state.py
View file

@ -768,7 +768,8 @@ def top(topfn,
st_ = salt.state.HighState(opts, pillar)
st_.push_active()
st_.opts['state_top'] = os.path.join('salt://', topfn)
st_.opts['state_top_saltenv'] = saltenv
if saltenv:
st_.opts['state_top_saltenv'] = saltenv
try:
ret = st_.call_highstate(
exclude=kwargs.get('exclude', []),