From 1be9bdc4b3ad94a7722a46eb6f4514f5cc7a30a2 Mon Sep 17 00:00:00 2001 From: RichardHoch Date: Thu, 5 Sep 2024 16:03:50 +0300 Subject: [PATCH] Adds PR 511 and 537 to MTV 2.5 Signed-off-by: RichardHoch --- .../doc-Migration_Toolkit_for_Virtualization/master.adoc | 1 + .../modules/migrating-virtual-machines-cli.adoc | 2 ++ ...ing-migration-network-for-vmware-source-provider.adoc | 2 ++ documentation/modules/snip_vmware-esxi-nfc.adoc | 6 ++++++ documentation/modules/vmware-prerequisites.adoc | 9 +++++++++ 5 files changed, 20 insertions(+) create mode 100644 documentation/modules/snip_vmware-esxi-nfc.adoc diff --git a/documentation/doc-Migration_Toolkit_for_Virtualization/master.adoc b/documentation/doc-Migration_Toolkit_for_Virtualization/master.adoc index e8a4e1d794d..e547080b547 100644 --- a/documentation/doc-Migration_Toolkit_for_Virtualization/master.adoc +++ b/documentation/doc-Migration_Toolkit_for_Virtualization/master.adoc @@ -146,6 +146,7 @@ You can add a source provider by using the {ocp} web console. :context: vmware :vmware: include::modules/adding-source-provider.adoc[leveloffset=+4] +include::modules/selecting-migration-network-for-vmware-source-provider.adoc[leveloffset=+5] :vmware!: :context: rhv :rhv: diff --git a/documentation/modules/migrating-virtual-machines-cli.adoc b/documentation/modules/migrating-virtual-machines-cli.adoc index 94bdd93e020..eeed1416ef4 100644 --- a/documentation/modules/migrating-virtual-machines-cli.adoc +++ b/documentation/modules/migrating-virtual-machines-cli.adoc @@ -137,6 +137,8 @@ EOF <1> Specify the name of the VMware `Provider` CR. <2> Specify the managed object reference (MOR) of the VMware host. <3> Specify the IP address of the VMware migration network. ++ +include::snip_vmware-esxi-nfc.adoc[] . Create a `NetworkMap` manifest to map the source and destination networks: + diff --git a/documentation/modules/selecting-migration-network-for-vmware-source-provider.adoc b/documentation/modules/selecting-migration-network-for-vmware-source-provider.adoc index e86bafb48b4..7b55ea9253e 100644 --- a/documentation/modules/selecting-migration-network-for-vmware-source-provider.adoc +++ b/documentation/modules/selecting-migration-network-for-vmware-source-provider.adoc @@ -10,6 +10,8 @@ You can select a migration network in the {ocp} web console for a source provide Using the default network for migration can result in poor performance because the network might not have sufficient bandwidth. This situation can have a negative effect on the source platform because the disk transfer operation might saturate the network. +include::snip_vmware-esxi-nfc.adoc[] + .Prerequisites * The migration network must have sufficient throughput, minimum speed of 10 Gbps, for disk transfer. diff --git a/documentation/modules/snip_vmware-esxi-nfc.adoc b/documentation/modules/snip_vmware-esxi-nfc.adoc new file mode 100644 index 00000000000..342496736ea --- /dev/null +++ b/documentation/modules/snip_vmware-esxi-nfc.adoc @@ -0,0 +1,6 @@ +:_content-type: SNIPPET + +[NOTE] +==== +You can also control the network from which disks are transferred from a host by using the Network File Copy (NFC) service in vSphere. +==== \ No newline at end of file diff --git a/documentation/modules/vmware-prerequisites.adoc b/documentation/modules/vmware-prerequisites.adoc index 4e04a7ad56d..298ee95ae58 100644 --- a/documentation/modules/vmware-prerequisites.adoc +++ b/documentation/modules/vmware-prerequisites.adoc @@ -42,6 +42,7 @@ The following minimal set of VMware privileges is required to migrate virtual ma 2+|`Virtual machine.Interaction` privileges: |`Virtual machine.Interaction.Power Off` |Allows powering off a powered-on virtual machine. This operation powers down the guest operating system. |`Virtual machine.Interaction.Power On` |Allows powering on a powered-off virtual machine and resuming a suspended virtual machine. +|`Virtual machine.Guest operating system management by VIX API` |Allows managing a virtual machine by the VMware VIX API. 2+a|`Virtual machine.Provisioning` privileges: [NOTE] ==== @@ -80,4 +81,12 @@ All `Virtual machine.Provisioning` privileges are required. 2+|`Virtual machine.Snapshot management` privileges: |`Virtual machine.Snapshot management.Create snapshot` |Allows creation of a snapshot from the virtual machine’s current state. |`Virtual machine.Snapshot management.Remove Snapshot` |Allows removal of a snapshot from the snapshot history. +2+|`Datastore` privileges: +|`Datastore.Browse datastore` |Allows exploring the contents of a datastore. +|`Datastore.Low level file operations` |Allows performing low-level file operations - read, write, delete, and rename - in a datastore. +2+|`Sessions` privileges: +|`Sessions.Validate session` |Allows verification of the validity of a session. +2+|`Cryptographic` privileges: +|`Cryptographic.Decrypt` |Allows decryption of an encrypted virtual machine. +|`Cryptographic.Direct access` |Allows access to encrypted resources. |===