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 #17039 from terminalmage/issue17017

Browse Source 
Fix state.sls_id
This commit is contained in:
Nicole Thomas 2014-10-30 11:37:31 -06:00
commit cea2f57f55
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/state.py
View File

@ -27,6 +27,7 @@ __proxyenabled__ = ['*']
__outputter__ = {
'sls': 'highstate',
'sls_id': 'highstate',
'pkg': 'highstate',
'top': 'highstate',
'single': 'highstate',
@ -643,10 +644,10 @@ def sls_id(
opts['test'] = __opts__.get('test', None)
st_ = salt.state.HighState(opts)
if isinstance(mods, string_types):
mods = mods.split(',')
split_mods = mods.split(',')
st_.push_active()
try:
high_, errors = st_.render_highstate({saltenv: mods})
high_, errors = st_.render_highstate({saltenv: split_mods})
finally:
st_.pop_active()
errors += st_.state.verify_high(high_)
@ -654,12 +655,18 @@ def sls_id(
__context__['retcode'] = 1
return errors
chunks = st_.state.compile_high_data(high_)
ret = {}
for chunk in chunks:
if chunk.get('__id__', '') == id_:
ret = st_.state.call_chunk(chunk, {}, chunks)
ret.update(st_.state.call_chunk(chunk, {}, chunks))
# Work around Windows multiprocessing bug, set __opts__['test'] back to
# value from before this function was run.
__opts__['test'] = orig_test
if not ret:
raise SaltInvocationError(
'No matches for ID \'{0}\' found in SLS \'{1}\' within saltenv '
'\'{2}\''.format(id_, mods, saltenv)
)
return ret