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

Add pillar pass-through to the state.sls runner

Browse Source
This commit is contained in:
Thomas S Hatch 2014-02-25 20:54:03 -07:00
parent a414bdc4fb
commit c5f294f1df
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/runners/state.py
View File

@ -50,7 +50,7 @@ def over(saltenv='base', os_fn=None):
return overstate.over_run
def sls(mods, saltenv='base', test=None, exclude=None):
def sls(mods, saltenv='base', test=None, exclude=None, pillar=None):
'''
Execute a state run from the master, used as a powerful orchestration
system.
@ -64,7 +64,12 @@ def sls(mods, saltenv='base', test=None, exclude=None):
'''
__opts__['file_client'] = 'local'
minion = salt.minion.MasterMinion(__opts__)
running = minion.functions['state.sls'](mods, saltenv, test, exclude)
running = minion.functions['state.sls'](
mods,
saltenv,
test,
exclude,
pillar=pillar)
ret = {minion.opts['id']: running}
salt.output.display_output(ret, 'highstate', opts=__opts__)
return ret