Skip to content

Commit

Permalink
Merge pull request #49759 from bloomberg/orch-jid-fix
Browse files Browse the repository at this point in the history
runners.state.orch: generate jid if missing
  • Loading branch information
Nicole Thomas committed Sep 26, 2018
2 parents 221bd63 + 9bb8d51 commit 3c488a8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions salt/runners/state.py
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

0 comments on commit 3c488a8

Please sign in to comment.