From c04a77d09ad5b0a5238681f6e2b9b485f44f1599 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 23 Jun 2016 10:38:47 -0400 Subject: [PATCH] RHEL 7: v2v: Remove --dcpath option (RHBZ#1315237, RHBZ#1429430) This is no longer required, since RHEL 7.3. --- v2v/cmdline.ml | 2 +- v2v/test-v2v-docs.sh | 2 +- v2v/virt-v2v.pod | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 9aecb5cd6..a2f132b6c 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -172,7 +172,7 @@ let parse_cmdline () = [ S 'b'; L"bridge" ], Getopt.String ("in:out", add_bridge), s_"Map bridge 'in' to 'out'"; [ L"compressed" ], Getopt.Set compressed, s_"Compress output file"; [ L"dcpath"; L"dcPath" ], Getopt.String ("path", set_string_option_once "--dcpath" dcpath), - s_"Override dcPath (for vCenter)"; + ""; [ L"debug-overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; [ S 'i' ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), diff --git a/v2v/test-v2v-docs.sh b/v2v/test-v2v-docs.sh index c5d98de7f..02750faf3 100755 --- a/v2v/test-v2v-docs.sh +++ b/v2v/test-v2v-docs.sh @@ -22,4 +22,4 @@ $TEST_FUNCTIONS skip_if_skipped $top_srcdir/podcheck.pl virt-v2v.pod virt-v2v \ - --ignore=--dcPath,--debug-overlay,--ic,--if,--in-place,--no-trim,--oa,--oc,--of,--on,--os,--vmtype + --ignore=--dcpath,--dcPath,--debug-overlay,--ic,--if,--in-place,--no-trim,--oa,--oc,--of,--on,--os,--vmtype diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index c45828b58..f4def737a 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -169,19 +169,6 @@ Write a compressed output file. This is only allowed if the output format is qcow2 (see I<-of> below), and is equivalent to the I<-c> option of L. -=item B<--dcpath> Folder/Datacenter - -B You don't need to use this parameter if you have -S 1.2.20>. - -For VMware vCenter, override the C parameter used to -select the datacenter. Virt-v2v can usually calculate this from the -C URI, but if it gets it wrong, then you can override it using -this setting. Go to your vCenter web folder interface, eg. -C (I a trailing slash), -and examine the C parameter in the URLs that appear on this -page. - =item B<--debug-overlays> Save the overlay file(s) created during conversion. This option is -- 2.13.4