Virt init improvements - #48261
Merged
Merged
Conversation
rallytime
suggested changes
Jun 22, 2018
rallytime
left a comment
rallytime
left a comment
Contributor
There was a problem hiding this comment.
Since I merged your other PR, this will need a rebase first.
Contributor
Author
|
@rallytime Thanks: rebase just done |
Contributor
|
@cbosdo There's a test failure here that needs to be addressed:
https://jenkins.saltstack.com/job/PR/job/salt-pr-linode-ubuntu14-n/23911/ Can you take a look? |
gtmanfred
approved these changes
Jun 25, 2018
Contributor
Author
|
hum... locale problems, I'll make the test more robust |
virt.get_disks does not need to depend on libvirt:hypervisor value to decice whether to extract data using qemu-img info on a disk image. This needs to be run on all qemu images... and those can be also used by a Xen VM nowadays. The refactoring removes that dependency on the deprecated configuration libvirt:hypervisor and uses the value for the <driver> type attribute in the disk XML configuration. Enhance the get_disk unit test to make sure that the qemu-img info is parsed for a qemu image and not for others
As mentioned in issue saltstack#48085 qemu-img infos parsing is really fragile. In order to fix the weaknesses of that parsing use the --output json parameter of qemu-img infos and parse this rather than the human output. Note that the following properties in virt.get_disks output have a different format: * disk size, virtual size and snapshot vmsize are now in bytes, rather than in a human-friendly format * date is now complete and in iso format, but that won't bother anybody since that was broken before (only had the time part) Since the image property was a duplicate of the file one, they have been consolidated into a single file property. All format-specific values are simply not provided, but as those were in the snapshots list before it's rather likely no one will care. Also write the parsed data into a dictionary rather than writing it as YAML in a string and parse it later on. This commit also adds a unit test for _parse_qemu_img_info() function.
As mentioned in issue saltstack#48085, if a disk image has a backing file, _parse_qemu_img_info() only returns the path to the backing file. From a user point of view this is rather limited since there is no way to know more on that file. virt.get_disks now uses --backing-chain parameter to get the disk data for all disks in the backing chain.
Storing the hypervisor type in a configuration value doesn't make sense since the libvirt host tells us what it is capable of. Instead use the values from the guest domains provided by the virt.capabilities. This is also the occasion to remove the use of the 'esxi' hypervisor in as many places as possible since this is a synonym of 'vmware' and 'vmware' is the value provided by the libvirt esx driver.
virt.init's enable_vnc is too limiting for the current possibilities of the libvirt stack. Deprecate it in favor of a graphics dictionary to allow creating VMs with VNC, Spice, RDP or no graphics. This design helps keeping the structure opened to support new parameters in the future.
virt.init just allows the user to pass in a profile name to get the list of network interfaces to create. This is rather good for simple cases, but requires the profile to be stored in the minion configuration. From that commit on, the user can use an interfaces parameter to customize the NICs from the template or add other ones. This could be handy for the virt.running state for example.
virt.init just allows the user to pass in a profile name to get the list of disk devices to create. This is rather good for simple cases, but requires the profile to be stored in the minion configuration. From that commit on, the user can use a disks parameter to customize the disks from the template or add other ones. This could be handy for the virt.running state for example. This new parameter makes the image parameter useless: deprecating it.
enable_qcow is rather badly named since it doesn't tell the user what that actually does. Thanks to the new disks parameter, this option can now be set on a per-disk basis in the disks structure using a new overlay_image property. enable_qcow is now marked as deprecated
virt images are not stored in /srv/salt/salt-images, but in /srv/salt-images. Fix the documentation to reflect the truth.
Disk profile structure wasn't containing the image filename and path. These were computed in two different places: one in _qemu_create_image() and one in _gen_xml. This commit moves all disks list computations in _disk_profile to get: - default values on both disk profile and user disks definitions - one place to compute all values This should reduce error risks in future disk-related changes.
Disk images are currently created at a patch matching this rule:
<virt:images>/<vmname>/<diskname>
In the future we want the user to be able to define in which libvirt
pool to create the image, rather than always in the default virt:images
folder. As libvirt doesn't allow volume names with a / in them, create
the qemu disk images in:
<virt:images>/<vmname>_<diskname>
Rather than returning a list of {name: dict_of_disk_props}, return
include the name as a property in each disk dictionary and remove one
level. This aligns disks with the structure returned for networks and
allows usage of list comrehensions to slightly simplify the calling code.
At times we need to know where the storage pool is pointing to and of what type it is. virt.pool_info is a nice place for this.
So far _disk_profile uses the pool property only for vmware hypervisors. Use it also for KVM/QEMU for users to be able to choose where to create their images. The pool property can be either the path to a local folder or an storage pool name.
Contributor
Author
|
@rallytime Should be fixed by now the expected string is now computed based on the locale... |
Contributor
|
re-run py |
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
3 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?
This PR makes
virt.initmore flexible for users. Rather than forcing all domain configuration in the minion configuration,virt.initnow allows defining and/or overriding default disks and network interfaces. It also allows more graphic types than the VNC.As an effort to understand
virt.initbefore modifying it, the virt documentation has been improved a lot.Note: this PR has been split in two: the first commits that are more independent have been submitted in PR #48262
What issues does this PR fix or reference?
Issue #48085 is also fixed in this PR.
Previous Behavior
See description.
New Behavior
See description
Tests written?
Yes
Commits signed with GPG?
Yes