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