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 #33578 disks grain #33604

Merged
merged 2 commits into from
May 31, 2016
Merged

Fix #33578 disks grain #33604

merged 2 commits into from
May 31, 2016

Conversation

kev009
Copy link
Contributor

@kev009 kev009 commented May 28, 2016

What does this PR do?

Some fixes for the disks grain changes in 2016.3.0.

What issues does this PR fix or reference?

#33578

Previous Behavior

The disks grain would throw a ValueError exception if rotationrate returned (unknown) in geom disk list because it tries to cast the data to an integer.

The grain would include cd-rom drives.

New Behavior

The datatype parsing is more resilient and will return None if the expected data type is not present.

The grain will not include cd-roms.

Tests written?

No

@cachedout
Copy link
Contributor

Go Go Jenkins!

@cachedout cachedout merged commit 44e8c9e into saltstack:2016.3 May 31, 2016
cachedout pushed a commit that referenced this pull request Jun 7, 2016
Fix #33604 implementation when 'geom disk list' does not output rotat…
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

2 participants