From 336242fa12fc9ddd6262b8fd08c1837abd5fddd4 Mon Sep 17 00:00:00 2001 From: Borys Pierov Date: Tue, 15 Mar 2016 14:58:42 -0400 Subject: [PATCH] Allow passing pillarenv into state.orchestrate --- salt/runners/state.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/salt/runners/state.py b/salt/runners/state.py index 3f93044fb4..117e503b3c 100644 --- a/salt/runners/state.py +++ b/salt/runners/state.py @@ -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: