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

Allow passing pillarenv into state.orchestrate

Browse Source
This commit is contained in:
Borys Pierov 2016-03-15 14:58:42 -04:00
parent 3a0f1f69b3
commit 336242fa12
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/runners/state.py
View File

@ -15,7 +15,12 @@ from salt.exceptions import SaltInvocationError
LOGGER = logging.getLogger(__name__)
def orchestrate(mods, saltenv='base', test=None, exclude=None, pillar=None):
def orchestrate(mods,
saltenv='base',
test=None,
exclude=None,
pillar=None,
pillarenv=None):
'''
.. versionadded:: 0.17.0
@ -33,6 +38,7 @@ def orchestrate(mods, saltenv='base', test=None, exclude=None, pillar=None):
salt-run state.orchestrate webserver
salt-run state.orchestrate webserver saltenv=dev test=True
salt-run state.orchestrate webserver saltenv=dev pillarenv=aws
.. versionchanged:: 2014.1.1
@ -53,7 +59,8 @@ def orchestrate(mods, saltenv='base', test=None, exclude=None, pillar=None):
saltenv,
test,
exclude,
pillar=pillar)
pillar=pillar,
pillarenv=pillarenv)
ret = {'data': {minion.opts['id']: running}, 'outputter': 'highstate'}
res = salt.utils.check_state_result(ret['data'])
if res: