Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

runners.state.orch: generate jid if missing #49759

Merged
merged 3 commits into from Sep 26, 2018
Merged

runners.state.orch: generate jid if missing #49759

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3a1e9d
state.orch: generate jid if missing
mattp- Sep 24, 2018
12c1755
Merge branch 'develop' into orch-jid-fix
mattp- Sep 25, 2018
9bb8d51
Merge branch 'develop' into orch-jid-fix
Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions salt/runners/state.py
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
import salt.loader
import salt.utils.event
import salt.utils.functools
import salt.utils.jid
from salt.exceptions import SaltInvocationError

LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -110,6 +111,8 @@ def orchestrate(mods,
pillarenv = __opts__['pillarenv']
if saltenv is None and 'saltenv' in __opts__:
saltenv = __opts__['saltenv']
if orchestration_jid is None:
orchestration_jid = salt.utils.jid.gen_jid(__opts__)

running = minion.functions['state.sls'](
mods,
Expand Down