[Libguestfs] [PATCH] v2v, p2v: rename rhvm network to ovirtmgmt (RHBZ#1429491)

Since RHV 3.6.10, the default network name is 'ovirtmgmt' instead of 'rhvm'. This is just a documentation change. --- p2v/virt-p2v.pod | 10 +++++----- v2v/cmdline.ml | 2 +- v2v/virt-v2v.pod | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod index ea685be..4a5f587 100644 --- a/p2v/virt-p2v.pod +++ b/p2v/virt-p2v.pod @@ -393,14 +393,14 @@ interfaces to the target C<default> network. You give a comma-separated list of C<interface:target> pairs, plus optionally a default target. For example: - p2v.network=em1:rhvm + p2v.network=em1:ovirtmgmt -maps interface C<em1> to target network C<rhvm>. +maps interface C<em1> to target network C<ovirtmgmt>. - p2v.network=em1:rhvm,em2:management,other + p2v.network=em1:ovirtmgmt,em2:management,other -maps interface C<em1> to C<rhvm>, and C<em2> to C<management>, and -any other interface that is found to C<other>. +maps interface C<em1> to C<ovirtmgmt>, and C<em2> to C<management>, +and any other interface that is found to C<other>. =item B<p2v.o=[libvirt|local|...]> diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 7135cfe..f417dea 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -220,7 +220,7 @@ let parse_cmdline () = virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi -os imported esx_guest virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi esx_guest \ - -o rhv -os rhv.nfs:/export_domain --network rhvm + -o rhv -os rhv.nfs:/export_domain --network ovirtmgmt virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index 3d0eada..fb1560f 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -7,7 +7,7 @@ virt-v2v - Convert a guest to use KVM virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi vmware_guest virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi vmware_guest \ - -o rhv -os rhv.nfs:/export_domain --network rhvm + -o rhv -os rhv.nfs:/export_domain --network ovirtmgmt virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp @@ -104,10 +104,10 @@ guest to a RHV-M Export Storage Domain which is located remotely (over NFS) at C<rhv.nfs:/export_domain>. If you are unclear about the location of the Export Storage Domain you should check the settings on your RHV-M management console. Guest network -interface(s) are connected to the target network called C<rhvm>. +interface(s) are connected to the target network called C<ovirtmgmt>. virt-v2v -ic vpx://vcenter.example.com/Datacenter/esxi vmware_guest \ - -o rhv -os rhv.nfs:/export_domain --network rhvm + -o rhv -os rhv.nfs:/export_domain --network ovirtmgmt In this case the host running virt-v2v acts as a B<conversion server>. @@ -974,13 +974,13 @@ This is typical of a libvirt guest: It has a single network interface connected to a network called C<default>. To map a specific network to a target network, for example C<default> -on the source to C<rhvm> on the target, use: +on the source to C<ovirtmgmt> on the target, use: - virt-v2v [...] --network default:rhvm + virt-v2v [...] --network default:ovirtmgmt To map every network to a target network, use: - virt-v2v [...] --network rhvm + virt-v2v [...] --network ovirtmgmt Bridges are handled in the same way, but you have to use the I<--bridge> option instead. For example: -- 2.9.3