Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lsscsi issues for certain platforms #30659

Merged
merged 1 commit into from
Jan 28, 2016
Merged

Conversation

sjmh
Copy link
Contributor

@sjmh sjmh commented Jan 27, 2016

The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system until RHEL7.

The command now has an option to specify 'get_size' to enable compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions getting thrown because of that.

Fixes #30565, needs to be ported to 2015.8 as well.

@@ -14,7 +15,7 @@
}


def ls_():
def ls_(get_size=True):
'''
List SCSI devices, with details

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a definition for get_size here, as well as a .. versionadded:: 2015.5.10 directive for that new kwarg?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, yup, sorry about that. I'll get that added today.

@rallytime
Copy link
Contributor

@sjmh This looks great, as usual, and thanks for the test! I only had one very nit-picky comment. I'll see what @basepi has to say about this change as well.

@basepi
Copy link
Contributor

basepi commented Jan 27, 2016

This gets the 👍 from me. Once the docstring is updated we can merge.

@basepi basepi added the pending-changes The pull request needs additional changes before it can be merged label Jan 27, 2016
The lsscsi command doesn't support the '-s' flag on any RHEL/CentOs system
until RHEL7.

The command now have an option to specify 'get_size' to enable
compatibility with the older platforms.

Also fixes some issues with lsscsi not being installed and exceptions
getting thrown because of that.
@sjmh
Copy link
Contributor Author

sjmh commented Jan 28, 2016

Updated the documentation - though looks like the test for ubuntu bailed. Is there a way to re-run the jenkins tests without having to push a fake update? :)

@rallytime rallytime removed the pending-changes The pull request needs additional changes before it can be merged label Jan 28, 2016
@rallytime
Copy link
Contributor

@sjmh This looks great! Thanks for making those changes.

One of the reasons we run these tests on multiple platforms on pull requests is for situations like this - if the test minion doesn't get provisioned/bootstrapped correctly, we can still see results of the run on another platform, so we're all good here. Thank you!

rallytime pushed a commit that referenced this pull request Jan 28, 2016
Fix lsscsi issues for certain platforms
@rallytime rallytime merged commit 8d79d1b into saltstack:2015.5 Jan 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants