Merged
Conversation
From the user point of view the internal RBD pool name doesn't make sense when listing the disks of a VM. We need then to resolve it to the libvirt pool name if possible. Move the corresponding code from purge to get_disks.
libvirt adds the index attribute in the XML definition when there is a backing store file for a disk. We need to elude it before comparing the sources to avoid trying to recreate disks in such cases.
cdrom devices can't use virtio. Set the default bus to ide for cdroms.
ghost
requested review from
virt._gen_xml converts the cdroms with remote URL into a network device, but to be coherent with the user input the virt.get_disk() function needs to reassemble the URL in thoses cases.
Some pool type require a secret for the authentication on the remote source. Remove the secrets that were added by pool_defined but leave the others in place.
Contributor
Author
|
@twangboy the ubuntu1604 failure seems completely unrelated to the PR, could you restart it? |
waynew
reviewed
May 18, 2020
Contributor
waynew
left a comment
waynew
left a comment
There was a problem hiding this comment.
Just a small question, otherwise 👍
waynew
approved these changes
May 18, 2020
Contributor
Author
|
yeah! all green 💚 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
What does this PR do?
Fixes miscellaneous problems related to the recent PR adding disk volume support in
virtmodule and state.virt.get_disks()virt.get_disks()What issues does this PR fix or reference?
Fixes: #56666
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes