mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
RHEL 8: v2v: rhv-upload: Remove restriction on -oa sparse.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1565681 and the v2v-devel private thread "Do we already support migration using FC?"
This commit is contained in:
committed by
Pino Toscano
parent
b60599b78b
commit
a233d0f924
@@ -177,19 +177,11 @@ See also the virt-v2v-output-rhv(1) manual.")
|
||||
error (f_"nbdkit was compiled without SELinux support. You will have to recompile nbdkit with libselinux-devel installed, or else set SELinux to Permissive mode while doing the conversion.")
|
||||
in
|
||||
|
||||
(* Output format/sparse must be raw/sparse. We may be able to
|
||||
* lift this limitation in future, but it requires changes on the
|
||||
* RHV side. See TODO file for details. XXX
|
||||
*)
|
||||
(* Output format must be raw. *)
|
||||
let error_current_limitation required_param =
|
||||
error (f_"rhv-upload: currently you must use ‘%s’. This restriction will be loosened in a future version.") required_param
|
||||
in
|
||||
|
||||
let error_unless_output_alloc_sparse () =
|
||||
if output_alloc <> Sparse then
|
||||
error_current_limitation "-oa sparse"
|
||||
in
|
||||
|
||||
(* JSON parameters which are invariant between disks. *)
|
||||
let json_params = [
|
||||
"verbose", JSON.Bool (verbose ());
|
||||
@@ -249,7 +241,6 @@ object
|
||||
error_unless_ovirtsdk4_module_available ();
|
||||
error_unless_nbdkit_working ();
|
||||
error_unless_nbdkit_python_plugin_working ();
|
||||
error_unless_output_alloc_sparse ();
|
||||
(* Python code prechecks. *)
|
||||
let precheck_fn = tmpdir // "v2vprecheck.json" in
|
||||
let fd = Unix.openfile precheck_fn [O_WRONLY; O_CREAT] 0o600 in
|
||||
|
||||
@@ -142,10 +142,8 @@ def open(readonly):
|
||||
format = disk_format,
|
||||
initial_size = params['disk_size'],
|
||||
provisioned_size = params['disk_size'],
|
||||
# XXX Ignores params['output_sparse'].
|
||||
# Handling this properly will be complex, see:
|
||||
# https://www.redhat.com/archives/libguestfs/2018-March/msg00177.html
|
||||
sparse = True,
|
||||
sparse = params['output_sparse'],
|
||||
storage_domains = [
|
||||
types.StorageDomain(
|
||||
name = params['output_storage'],
|
||||
|
||||
@@ -5,7 +5,7 @@ virt-v2v-output-rhv - Using virt-v2v to convert guests to oVirt or RHV
|
||||
=head1 SYNOPSIS
|
||||
|
||||
virt-v2v [-i* options] -o rhv-upload [-oc ENGINE_URL] -os STORAGE
|
||||
[-op PASSWORD] [-of raw]
|
||||
[-op PASSWORD]
|
||||
[-oo rhv-cafile=FILE]
|
||||
[-oo rhv-cluster=CLUSTER]
|
||||
[-oo rhv-direct]
|
||||
@@ -79,12 +79,6 @@ username is not specified then virt-v2v defaults to using
|
||||
C<admin@internal> which is the typical superuser account for oVirt
|
||||
instances.
|
||||
|
||||
=item I<-of raw>
|
||||
|
||||
Currently you must use I<-of raw> and you cannot use I<-oa preallocated>.
|
||||
|
||||
These restrictions will be loosened in a future version.
|
||||
|
||||
=item I<-op> F<password-file>
|
||||
|
||||
A file containing a password to be used when connecting to the oVirt
|
||||
|
||||
Reference in New Issue
Block a user