Skip to content

Commit

Permalink
Use salt-call from the bundle with transactional_update
Browse files Browse the repository at this point in the history
  • Loading branch information
vzhestkov committed Sep 18, 2023
1 parent 3cc2aee commit e7a8072
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion salt/modules/transactional_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,9 @@
"""

import logging
import os.path
import pathlib
import sys

import salt.client.ssh.state
import salt.client.ssh.wrapper.state
Expand Down Expand Up @@ -941,10 +944,18 @@ def call(function, *args, **kwargs):
activate_transaction = kwargs.pop("activate_transaction", False)

try:
# Set default salt-call command
salt_call_cmd = "salt-call"
python_exec_dir = os.path.dirname(sys.executable)
if "venv-salt-minion" in pathlib.Path(python_exec_dir).parts:
# If the module is executed with the Salt Bundle,
# use salt-call from the Salt Bundle
salt_call_cmd = os.path.join(python_exec_dir, "salt-call")

safe_kwargs = salt.utils.args.clean_kwargs(**kwargs)
salt_argv = (
[
"salt-call",
salt_call_cmd,
"--out",
"json",
"-l",
Expand Down

0 comments on commit e7a8072

Please sign in to comment.