Fix issue with disk.tune passing incorrect args #68491
Draft
Conversation
This file contains hidden or 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
481965e to
f46a00f
Compare
Fixes issue with disk.tune passing incorrect args of "read-only", "read-write" rather than "setro" and "setrw" to blockdev. Also cleans up handling of args, so that "read-only" and "read-write" can only have a value of True - they can't be negated. Adds checking of return status from blockdev - that was just being discarded.
f46a00f to
848148b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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?
Fixes issue with disk.tune passing incorrect args of "read-only", "read-write" rather than "setro" and "setrw" to blockdev.
Also cleans up handling of args, so that "read-only" and "read-write" can only have a value of True - they can't be negated.
Adds checking of return status from blockdev - that was just being discarded.
What issues does this PR fix or reference?
Fixes 68490
Previous Behavior
Calling the function with
read-write=Trueorread-only=Truewould show and error fromblockdevand fail to make the change. Despite this it would not return a failure.New Behavior
Options work correctly and change state of blockdevice.
Other incorrect args such as
read-only=Falseorread-write=Falsewill now raise aSaltInvocationError.Failures in
blockdevwill raise aCommandExecutionErrorMerge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with SSH key?
Yes