Virt disk fixes - Fluorine backport #50379
Merged
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
Disks like cdroms have no source element. We need to handle iit in the disks comparison or we'll have exceptions when updating VMs that haven't been generated by salt virt module.
Disk devices can be of several types and we need to handle them in order to update existing VMms with floppy or cdrom devices. cdrom devices are particularly interesting since they can also have no source.
Using a dict breaks the disk order which might be of importance to users. It only hides the disk name from the template rendering, but that one property wasn't used.
While updating a domain, we need to ensure the disks are in the order defined by the user.
Ensure the disk target devices are unique within the disks in the new list before diffing them. Libvirt will reorder the disks based on their targets. If the users gives a disk order that is not consistent with the currently running VM, then it's his fault giving us wrong data.
Contributor
Author
|
@gtmanfred @rallytime this PR is ready for review |
rallytime
approved these changes
Nov 5, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport of PR #50356
What does this PR do?
This PR handles cdrom disks devices in the virt module. When updating VMs created outside of salt virt module we would hit problems since these devices can have no attached source.
What issues does this PR fix or reference?
None
Previous Behavior
Run a
virt.updateon a VM that has a cdrom device with no ISO attached. The salt call will fail with a message saying None is not an iterable type.New Behavior
Running a
virt.updatedoesn't trigger an exception and keeps the cdrom (or floppy) device intact.Tests written?
Yes
Commits signed with GPG?
Yes