[master] Use salt-call from salt bundle with transactional_update #65204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
salt-project-bot-prod-environment
bot
changed the title
vzhestkov
force-pushed
the
use-salt-call-from-salt-bundle-with-transactional_update
branch
from
422ef4f
to
05be8e2
Compare
vzhestkov
force-pushed
the
use-salt-call-from-salt-bundle-with-transactional_update
branch
from
05be8e2
to
f6e54bc
Compare
3 tasks
agraul
reviewed
Sep 22, 2023
Comment on lines
+947
to
+953
| # 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") |
There was a problem hiding this comment.
Why is it needed to do the path juggling inside Python code, can't we prepend the "Salt Bundle" bin/ directory to $PATH?
There was a problem hiding this comment.
Yes, we can do it with PATH outside, but actually I think to do it this way is more raliable as it's more strict and in case of handling transactional_update with salt-ssh it will push us to make the external solution more conditional
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
What issues does this PR fix or reference?
In some cases if both salt bundle and classic salt package installed on the same system, transactional_update module can wrongly execute
salt-callof classic salt packge instead of salt bundle which was used to process the event.Previous Behavior
Wrong
salt-callexecuted inside the transaction while usingtransactional_update.New Behavior
In case if the event processed with salt from the bundle
transactional_updatewill callsalt-callfrom the bundle explicitly.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.