Fix ssh_auth pulling keyfile from correct env #10197
Merged
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
|
Test FAILed. |
|
Test FAILed. |
s0undt3ch
added a commit
to s0undt3ch/salt
that referenced
this pull request
Feb 5, 2014
s0undt3ch
added a commit
that referenced
this pull request
Feb 5, 2014
Fix ssh_auth pulling keyfile from correct env
s0undt3ch
added a commit
to s0undt3ch/salt
that referenced
this pull request
Feb 5, 2014
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.
When the ssh_auth state is reading the key from a file on the Salt fileserver, the proper environment isn't passed in. If the key file is in a non-'base' environment it fails.
Looks like this got broken in fbfd926 and affects the 2014.1.0RC3 branch. It was not broken in v0.17.4. Trying to get this in before the release, since it breaks my state files!