search for: install_rhev_apt

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

It seems we're missing this in rhv-upload. Unfortunately I'm not able to test it at the moment. Tomáš Golembiovský (1): v2v: -o rhv-upload: install RHV tools v2v/output_rhv_upload.ml | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.0

...> > * This only does a "pre-conversion", the steps needed to get the > > @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = > > > > (* Install RHEV-APT only if appropriate for the output hypervisor. *) > > if output#install_rhev_apt then ( > > - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in > > - if Sys.file_exists tool_path then > > - configure_rhev_apt tool_path > > - else > > - warning (f_"%s is missing, but the output hypervisor is oVir...

...orage Domain") os in esd_mp <- mp; diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index 14153db3..01b1ce4a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -290,7 +290,7 @@ object (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true - method prepare_targets source_name overlays = + method prepare_targets source_name overlays _ = let uuids = match rhv_options.rhv_disk_uuids with | None -> diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 1c84439e..bfb9856d 100644 --- a/v2v/output_vdsm.m...

...nside the ISO *) + (* Convert Windows guests. * * This only does a "pre-conversion", the steps needed to get the @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = (* Install RHEV-APT only if appropriate for the output hypervisor. *) if output#install_rhev_apt then ( - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in - if Sys.file_exists tool_path then - configure_rhev_apt tool_path - else - warning (f_"%s is missing, but the output hypervisor is oVirt or RHV. Installing RHEV-APT in the guest would...

...f run_command cmd <> 0 then + error (f_"qemu-img command failed, see earlier errors"); + method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspect -> target_firmware -> unit method keep_serial_console = true method install_rhev_apt = false diff --git a/v2v/types.mli b/v2v/types.mli index be9406100785..a3b89bbcc9b3 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -438,7 +438,9 @@ end │ this by defining output#disk_create. ▼ copying Guest data is copied to the target...

...--git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index dc0d96d53..0152b8d5a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -247,6 +247,9 @@ object method supported_firmware = [ TargetBIOS ] + (* rhev-apt.exe will be installed (if available). *) + method install_rhev_apt = true + method prepare_targets source targets = let output_name = source.s_name in let json_params = -- 2.17.0

...ethod disk_create = (open_guestfs ())#disk_create + method disk_copied (_ : target) (_ : int) (_ : int) = () method virtual create_metadata : source -> target list -> target_buses -> guestcaps -> inspect -> target_firmware -> unit method keep_serial_console = true method install_rhev_apt = false diff --git a/v2v/types.mli b/v2v/types.mli index be9406100..bf573d56d 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -485,6 +485,10 @@ class virtual output : object (** Called in order to create disks on the target. The method has the same signature as Guestfs#disk_create. No...

...hv_cluster_cpu_architecture <- + Some (JSON_parser.object_get_string "rhv_cluster_cpu_architecture" json); if have_selinux then error_unless_nbdkit_compiled_with_selinux () @@ -290,7 +294,19 @@ object (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true - method prepare_targets source_name overlays _ = + method prepare_targets source_name overlays guestcaps = + let rhv_cluster_name = + match List.assoc "rhv_cluster" json_params with + | JSON.String s -> s + | _ -> assert false in + (match rhv_cluster...

...n future, but it requires changes on the * RHV side. See TODO file for details. XXX *) @@ -287,6 +287,8 @@ object method supported_firmware = [ TargetBIOS; TargetUEFI ] + method transfer_format t = "raw" + (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true @@ -333,8 +335,7 @@ object let disk_format = match target_format with | "raw" as fmt -> fmt - | "qcow2" -> - error_current_limitation "-of raw" + | "qcow2" as fmt -> fmt...

...Windows guests. > * > * This only does a "pre-conversion", the steps needed to get the > @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = > > (* Install RHEV-APT only if appropriate for the output hypervisor. *) > if output#install_rhev_apt then ( > - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in > - if Sys.file_exists tool_path then > - configure_rhev_apt tool_path > - else > - warning (f_"%s is missing, but the output hypervisor is oVirt or RHV. Installing RHE...

...253,7 +253,7 @@ object sprintf " -oc %s -op %s -os %s" output_conn output_password output_storage - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true @@ -407,7 +407,7 @@ If the messages above are not sufficient to diagnose the problem then add the (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect - output_alloc + target_firmwa...

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

....map List.rev !rhv_disk_uuids in - { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } + { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer; rhv_disk_uuids } let nbdkit_python_plugin = Config.virt_v2v_nbdkit_python_plugin let pidfile_timeout = 30 @@ -283,6 +293,16 @@ object method install_rhev_apt = true method prepare_targets source overlays _ _ _ _ = + let uuids = + match rhv_options.rhv_disk_uuids with + | None -> + List.map (fun _ -> None) overlays + | Some uuids -> + if List.length uuids <> List.length overlays then + error (f...

Add support for qcow2 disk format, enabled by imageio NBD backend in RHV 4.3. To use this feature manually, you can run virt-v2v with "-of qcow2". Here is example run: Source disk: $ qemu-img info /var/tmp/fedora-30.img image: /var/tmp/fedora-30.img file format: raw virtual size: 6 GiB (6442450944 bytes) disk size: 1.15 GiB virt-v2v: $ ./run virt-v2v \ -v \ -i disk

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix