ssh-client: fix merge order of options in run_wfunc (fix usage of mine.get in pillar) #50489
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
…e.get in salt-ssh pillar) This commit fixe a long standing issue: saltstack#36796 A first attempt to fix it is present in PR saltstack#41025
ghost
requested review from
thatch45
approved these changes
Nov 20, 2018
isbm
suggested changes
Nov 22, 2018
salt/client/ssh/__init__.py
Outdated
| log.debug(self.fun+" is a minion centric function") | ||
| popts.update(opts_pkg) | ||
| else: | ||
| log.debug(self.fun+" is a master centric function") |
There was a problem hiding this comment.
Logging should be fixed here:
log.debug('%s is a minion function', self.fun)
|
I went ahead and just made the changes that were requested by @isbm |
isbm
reviewed
Nov 29, 2018
| # Once pillar has been compiled, restore priority of minion opts | ||
| if self.fun not in master_centric_funcs: | ||
| log.debug('%s is a minion function', self.fun) | ||
| popts.update(opts_pkg) |
There was a problem hiding this comment.
@cachedout I am still wondering if we need that popts.update(opts_pkg) first time. This one is a second.
There was a problem hiding this comment.
Will it do any harm though?
There was a problem hiding this comment.
I think this is fine and it makes sense.
thatch45
approved these changes
Dec 14, 2018
| # Once pillar has been compiled, restore priority of minion opts | ||
| if self.fun not in master_centric_funcs: | ||
| log.debug('%s is a minion function', self.fun) | ||
| popts.update(opts_pkg) |
There was a problem hiding this comment.
I think this is fine and it makes sense.
alexey-zhukovin
pushed a commit
to alexey-zhukovin/salt
that referenced
this pull request
May 4, 2020
Closed
lkubb
added a commit
to lkubb/salt
that referenced
this pull request
Oct 30, 2023
This also ports saltstack#50489 into the present
s0undt3ch
pushed a commit
that referenced
this pull request
Nov 26, 2023
This also ports #50489 into the present
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?
pillar.Pillar() is called with options where master_opts options are overwritten (because of dict merge/update order). As a consequence, most saltutil functions are not available in the pillar when salt-ssh client is used.
This PR change the opts merge order selectively based on specific wfunc routines (eg: mine.get, pillar.items ...)
What issues does this PR fix or reference?
#36796
#41025
Previous Behavior
master_opts are overwritten when calling mine.get or pillar.items within salt-ssh client.
master_opts takes precedence when calling mine.get or pillar.items within salt-ssh client.
Tests written?
No
Commits signed with GPG?
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.