valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6332 from d--j/patch-1

Browse Source 
Make state.show_{highstate,lowstate,sls} work with PyDSL
This commit is contained in:
Thomas S Hatch 2013-07-26 10:32:46 -07:00
commit 5aa4b8206b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/modules/state.py
View File

@ -347,7 +347,11 @@ def show_highstate():
salt '*' state.show_highstate
'''
st_ = salt.state.HighState(__opts__)
ret = st_.compile_highstate()
st_.push_active()
try:
ret = st_.compile_highstate()
finally:
st_.pop_active()
if isinstance(ret, list):
__context__['retcode'] = 1
return ret
@ -362,7 +366,11 @@ def show_lowstate():
salt '*' state.show_lowstate
'''
st_ = salt.state.HighState(__opts__)
ret = st_.compile_low_chunks()
st_.push_active()
try:
ret = st_.compile_low_chunks()
finally:
st_.pop_active()
if isinstance(ret, list):
__context__['retcode'] = 1
return ret
@ -385,7 +393,11 @@ def show_sls(mods, env='base', test=None, **kwargs):
st_ = salt.state.HighState(opts)
if isinstance(mods, string_types):
mods = mods.split(',')
high_, errors = st_.render_highstate({env: mods})
st_.push_active()
try:
high_, errors = st_.render_highstate({env: mods})
finally:
st_.pop_active()
errors += st_.state.verify_high(high_)
if errors:
__context__['retcode'] = 1