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.

Sign up for GitHub

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

Jump to bottom

Extend conversion API with option to inject virtio drivers #13748

Merged
merged 13 commits into from
Jul 26, 2024
Merged

Extend conversion API with option to inject virtio drivers #13748

merged 13 commits into from
Jul 26, 2024

Conversation

MusicDin
Copy link
Member

This PR adds new conversion option virtio (disabled by default). When enabled, LXD invokes virt-v2v-in-place tool on the host to inject virtio drivers into the image. For Windows images, additional drivers need to be present in /usr/share/virt-tools.

This requires:

@github-actions github-actions bot added Documentation Documentation needs updating API Changes to the REST API labels Jul 12, 2024
@github-actions GitHub Actions
Copy link

Heads up @ru-fu - the "Documentation" label was applied to this issue.

@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch 5 times, most recently from 954d775 to 864f407 Compare July 12, 2024 12:07
ru-fu
ru-fu reviewed Jul 15, 2024
View reviewed changes
doc/.wordlist.txt Outdated Show resolved Hide resolved
doc/howto/import_machines_to_instances.md Outdated Show resolved Hide resolved
doc/howto/import_machines_to_instances.md Outdated Show resolved Hide resolved
doc/howto/import_machines_to_instances.md Outdated Show resolved Hide resolved
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from 864f407 to fc59dc0 Compare July 16, 2024 08:11
ru-fu
ru-fu reviewed Jul 16, 2024
View reviewed changes
doc/howto/import_machines_to_instances.md Outdated Show resolved Hide resolved
doc/howto/import_machines_to_instances.md Outdated Show resolved Hide resolved
doc/.sphinx/.markdownlint/exceptions.txt Outdated Show resolved Hide resolved
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch 2 times, most recently from 7dba25e to 8bb7a17 Compare July 16, 2024 08:31
@tomponline
Copy link
Member

Time to rebase please

@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from 8bb7a17 to 21dce8c Compare July 17, 2024 21:01
@github-actions github-actions bot removed the API Changes to the REST API label Jul 17, 2024
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from 21dce8c to 00513b6 Compare July 17, 2024 21:09
@tomponline
Copy link
Member

@MusicDin ready for review?

@MusicDin MusicDin marked this pull request as ready for review July 18, 2024 07:30
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from 00513b6 to d971dd4 Compare July 18, 2024 08:22
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from d971dd4 to 8b1b5ec Compare July 18, 2024 09:10
tomponline
tomponline requested changes Jul 18, 2024
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

Looking good, just a few nits/questions really.

tomponline
tomponline reviewed Jul 25, 2024
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

A few nits, but i would say very nearly ready.

@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch 3 times, most recently from 3d637fb to 9503644 Compare July 26, 2024 07:31
@MusicDin
Copy link
Member Author

@tomponline Ready for another round of review

tomponline
tomponline requested changes Jul 26, 2024
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

Just an issue with correct attribution of the writeback change.

@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from 9503644 to e4efb00 Compare July 26, 2024 09:36
stgraber and others added 9 commits July 26, 2024 09:37
@stgraber @MusicDin
lxd/storage: Use writeback mode for qemu-img convert
355f38c 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit bbc1ea8cd0cb01b4830fd960007f4c5b6d05edf2)
Signed-off-by: Din Music <[email protected]>
License: Apache-2.0
@stgraber @MusicDin
lxd/storage/backend_lxd: Improve image unpacking message
568c8d5 
Signed-off-by: Stéphane Graber <[email protected]>
(cherry picked from commit f57c3e41beb406da488888493ddae953aa71f9f3)
Signed-off-by: Din Music <[email protected]>
License: Apache-2.0
@MusicDin
lxd/storage/backend_lxd: Reuse qemu-img info helper to inspect image
4b614f5 
Signed-off-by: Din Music <[email protected]>
@MusicDin
lxd/storage/backend_lxd: Remove image after format conversion
7464ca8 
Signed-off-by: Din Music <[email protected]>
@MusicDin
lxd/storage/backend_lxd: Indicate conversion format in log
09fcbf8 
Signed-off-by: Din Music <[email protected]>
@MusicDin
lxd/storage/backend_lxd: Inject virtio drivers into imported image
4f710f9 
Use virt-v2v-in-place for injecting virtio drivers into the image.

Signed-off-by: Din Music <[email protected]>
@MusicDin
doc: Document usage of conversion option
59e5c9d 
Signed-off-by: Din Music <[email protected]>
@MusicDin
doc: Fix exception rules for base URL
6a1bfed 
Signed-off-by: Din Music <[email protected]>
@MusicDin
doc: Add virtio to the wordlist
29be374 
Signed-off-by: Din Music <[email protected]>
@MusicDin MusicDin force-pushed the feat/vm-import-v2v branch from e4efb00 to 29be374 Compare July 26, 2024 09:37
tomponline
tomponline approved these changes Jul 26, 2024
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

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

LGTM!

@tomponline
Copy link
Member

@MusicDin cool thanks, will merge this soon. Do you have a PR for lxd-ci to test virtio mode in the works?

@tomponline tomponline merged commit 51d8dc8 into canonical:main Jul 26, 2024
28 checks passed
@MusicDin MusicDin deleted the feat/vm-import-v2v branch July 26, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ru-fu ru-fu ru-fu left review comments

@tomponline tomponline tomponline approved these changes

Assignees
No one assigned
Labels
Documentation Documentation needs updating
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MusicDin @tomponline @ru-fu @stgraber