bugfix for auth_safemode #46089
Merged
bugfix for auth_safemode #46089
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
garethgreenaway
approved these changes
Feb 20, 2018
gtmanfred
suggested changes
Feb 23, 2018
salt/minion.py
Outdated
| @@ -2624,7 +2624,7 @@ def tune_in(self, start=True): | |||
| def ping_master(): | |||
| try: | |||
| def ping_timeout_handler(*_): | |||
| if not self.opts.get('auth_safemode', True): | |||
| if self.opts.get('auth_safemode', True): | |||
There was a problem hiding this comment.
Looks like this was implemented incorrectly, but we should not have it switch to True, if it is not specified, it should be False in the .get() as well.
There was a problem hiding this comment.
@rongzeng54 Did you see the feedback here?
gtmanfred
approved these changes
Mar 13, 2018
rallytime
approved these changes
Mar 13, 2018
|
re-run ubuntu |
|
re-run py3 |
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?
bugfix for auth_safemode as the docs(https://docs.saltstack.com/en/develop/ref/configuration/minion.html) said:
`AUTH_SAFEMODE
New in version 2014.7.0.
Default: False
If authentication fails due to SaltReqTimeoutError during a ping_interval, this setting, when set to True, will cause a sub-minion process to restart.`
What issues does this PR fix or reference?
No
Tests written?
No
Commits signed with GPG?
No