Merge pull request #29515 from apinnick/bz1929174-cnv-vm-import-access-modes

apinnick · web-flow · commit b4439a3bd565 · 2021-02-24T16:24:57.000+02:00
Updating CNV VM import to RHV (2.6.1)
diff --git a/modules/virt-importing-vm-cli.adoc b/modules/virt-importing-vm-cli.adoc
@@ -11,7 +11,7 @@ Optional: You can create a `ResourceMapping` CR that is separate from the `Virtu
 
 [IMPORTANT]
 ====
-The default target storage class must be NFS. Cinder does not support RHV VM import. See link:https://bugzilla.redhat.com/show_bug.cgi?id=1856439[(*BZ#1856439*)].
+The default target storage class must be NFS. Cinder does not support RHV VM import.
 ====
 
 .Procedure
@@ -29,7 +29,7 @@ metadata:
 type: Opaque
 stringData:
   ovirt: |
-    apiUrl: "https://<RHVM-FQDN>:8443/ovirt-engine/api" <2>
+    apiUrl: <api_endpoint> <2>
     username: admin@internal
     password: <3>
     caCert: |
@@ -39,7 +39,7 @@ stringData:
 EOF
 ----
 <1> Optional. You can specify a different namespace in all the CRs.
-<2> Specify the FQDN of the RHV Manager.
+<2> Specify the API endpoint of the RHV Manager, for example, `\"https://www.example.com:8443/ovirt-engine/api"`
 <3> Specify the password for `admin@internal`.
 <4> Specify the RHV Manager CA certificate. You can obtain the CA certificate by running the following command:
 +
@@ -48,70 +48,38 @@ EOF
 $ openssl s_client -connect :443 -showcerts < /dev/null
 ----
 
-. Optional: Create the `ResourceMapping` CR if you want to separate the resource mapping from the `VirtualMachineImport` CR by running the following command:
+. Optional: Create a `ResourceMapping` CR if you want to separate the resource mapping from the `VirtualMachineImport` CR by running the following command:
 +
-ifeval::["{VirtVersion}" < "2.5"]
-[source,yaml]
-----
-$ cat <<EOF | kubectl create -f -
-apiVersion: v2v.kubevirt.io/v1beta1
-kind: ResourceMapping
-metadata:
-  name: resourcemapping-example
-  namespace: default
-spec:
-  ovirt:
-    networkMappings:
-      - source:
-          name: <rhv-logical-network>/<vnic-profile> <1>
-        target:
-          name: <target-network> <2>
-        type: pod
-    storageMappings: <3>
-      - source:
-          name: <rhv-storage-domain> <4>
-        target:
-          name: <target-storage-class> <5>
-EOF
-----
-<1> Specify the RHV logical network and vNIC profile.
-<2> Specify the {VirtProductName} network.
-<3> If `storageMappings` are specified in both the `ResourceMapping` and the `VirtualMachineImport` CRs, the `VirtualMachineImport` CR takes precedence.
-<4> Specify the RHV storage domain.
-<5> The default storage class must be `nfs`.
-endif::[]
-ifeval::["{VirtVersion}" >= "2.5"]
 [source,yaml]
 ----
 $ cat <<EOF | kubectl create -f -
 apiVersion: v2v.kubevirt.io/v1alpha1
 kind: ResourceMapping
 metadata:
-  name: resourcemapping-example
+  name: resourcemapping_example
   namespace: default
 spec:
   ovirt:
     networkMappings:
       - source:
-          name: <rhv-logical-network>/<vnic-profile> <1>
+          name: <rhv_logical_network>/<vnic_profile> <1>
         target:
-          name: <target-network> <2>
+          name: <target_network> <2>
         type: pod
     storageMappings: <3>
       - source:
-          name: <rhv-storage-domain> <4>
+          name: <rhv_storage_domain> <4>
         target:
-          name: <target-storage-class> <5>
-        volumeMode: <volume-mode> <6>
+          name: <target_storage_class> <5>
+        volumeMode: <volume_mode> <6>
 EOF
 ----
 <1> Specify the RHV logical network and vNIC profile.
 <2> Specify the {VirtProductName} network.
-<3> If `storageMappings` are specified in both the `ResourceMapping` and the `VirtualMachineImport` CRs, the `VirtualMachineImport` CR takes precedence.
+<3> If storage mappings are specified in both the `ResourceMapping` and the `VirtualMachineImport` CRs, the `VirtualMachineImport` CR takes precedence.
 <4> Specify the RHV storage domain.
-<5> Specify the target storage class as `nfs` or `ocs-storagecluster-ceph-rbd`.
+<5> Specify `nfs` or `ocs-storagecluster-ceph-rbd`.
 <6> If you specified the `ocs-storagecluster-ceph-rbd` storage class, you must specify `Block` as the volume mode.
-endif::[]
 
 . Create the `VirtualMachineImport` CR by running the following command:
 +
@@ -130,47 +98,53 @@ spec:
 # resourceMapping: <1>
 #   name: resourcemapping-example
 #   namespace: default
-  targetVmName: vm-example <2>
+  targetVmName: vm_example <2>
   startVm: true
   source:
     ovirt:
       vm:
-        id: <source-vm-id> <3>
-        name: <source-vm-name> <4>
+        id: <source_vm_id> <3>
+        name: <source_vm_name> <4>
       cluster:
-        name: <source-cluster-name> <5>
+        name: <source_cluster_name> <5>
       mappings: <6>
         networkMappings:
           - source:
-              name: <source-logical-network>/<vnic-profile> <7>
+              name: <source_logical_network>/<vnic_profile> <7>
             target:
-              name: <target-network> <8>
+              name: <target_network> <8>
             type: pod
         storageMappings: <9>
           - source:
-              name: <source-storage-domain> <10>
+              name: <source_storage_domain> <10>
             target:
-              name: <target-storage-class> <11>
+              name: <target_storage_class> <11>
+            accessMode: <volume_access_mode> <12>
         diskMappings:
           - source:
-              id: <source-vm-disk-id> <12>
+              id: <source_vm_disk_id> <13>
             target:
-              name: <target-storage-class> <13>
+              name: <target_storage_class> <14>
 EOF
 ----
 <1> If you create a `ResourceMapping` CR, uncomment the `resourceMapping` section.
 <2> Specify the target VM name.
-<3> Specify the source VM ID, for example, `80554327-0569-496b-bdeb-fcbbf52b827b`. You can obtain the VM ID by entering `\https://<RHV_Manager_FQDN>/ovirt-engine/api/vms/` in a web browser on the Manager machine to list all VMs. Locate the VM you want to import and its corresponding VM ID. You do not need to specify a VM name or cluster name.
+<3> Specify the source VM ID, for example, `80554327-0569-496b-bdeb-fcbbf52b827b`. You can obtain the VM ID by entering `\https://www.example.com/ovirt-engine/api/vms/` in a web browser on the Manager machine to list all VMs. Locate the VM you want to import and its corresponding VM ID. You do not need to specify a VM name or cluster name.
 <4> If you specify the source VM name, you must also specify the source cluster. Do not specify the source VM ID.
 <5> If you specify the source cluster, you must also specify the source VM name. Do not specify the source VM ID.
 <6> If you create a `ResourceMapping` CR, comment out the `mappings` section.
 <7> Specify the logical network and vNIC profile of the source VM.
 <8> Specify the {VirtProductName} network.
-<9> If `storageMappings` are specified in both the `ResourceMapping` and the `VirtualMachineImport` CRs, the `VirtualMachineImport` CR takes precedence.
+<9> If storage mappings are specified in both the `ResourceMapping` and the `VirtualMachineImport` CRs, the `VirtualMachineImport` CR takes precedence.
 <10> Specify the source storage domain.
 <11> Specify the target storage class.
-<12> Specify the source VM disk ID, for example, `8181ecc1-5db8-4193-9c92-3ddab3be7b05`. You can obtain the disk ID by entering `\https://<RHV_Manager_FQDN>/ovirt-engine/api/vms/<VM_ID>` in a web browser on the Manager machine and reviewing the VM details.
-<13> Specify the target storage class.
+<12> Specify `ReadWriteOnce`, `ReadWriteMany`, or `ReadOnlyMany`. If no access mode is specified, {virt} determines the correct volume access mode based on the *Host* -> *Migration mode* setting of the RHV VM or on the virtual disk access mode:
+* If the RHV VM migration mode is `Allow manual and automatic migration`, the default access mode is `ReadWriteMany`.
+* If the RHV virtual disk access mode is `ReadOnly`, the default access mode is `ReadOnlyMany`.
+* For all other settings, the default access mode is `ReadWriteOnce`.
+
+<13> Specify the source VM disk ID, for example, `8181ecc1-5db8-4193-9c92-3ddab3be7b05`. You can obtain the disk ID by entering `\https://www.example.com/ovirt-engine/api/vms/vm23` in a web browser on the Manager machine and reviewing the VM details.
+<14> Specify the target storage class.
 
 . Follow the progress of the virtual machine import to verify that the import was successful:
 +
diff --git a/modules/virt-storage-wizard-fields-web.adoc b/modules/virt-storage-wizard-fields-web.adoc
@@ -1,7 +1,7 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-create-vms.adoc
-// * virt/virtual_machines/importing_vms/virt-importing-vmware-vm.adoc
+// * virt/virtual_machines/importing_vms/virt-importing-rhv-vm.adoc
 // * virt/vm_templates/virt-creating-vm-template.adoc
 
 [id="virt-storage-wizard-fields-web_{context}"]
@@ -52,17 +52,20 @@
 |Advanced -> Volume Mode
 |
 |Defines whether the persistent volume uses a formatted file system or raw block state. Default is *Filesystem*.
-
+ifeval::["{context}" != "virt-importing-rhv-vm"]
 |Advanced -> Access Mode
 |
 |Access mode of the persistent volume. Supported access modes are *Single User (RWO)*, *Shared Access (RWX)*, and *Read Only (ROX)*.
-
+endif::[]
 |===
 
 [id="virt-storage-wizard-fields-advanced-web_{context}"]
 [discrete]
 == Advanced storage settings
+
+ifeval::["{context}" != "virt-importing-rhv-vm"]
 The following advanced storage settings are available for *Blank*, *Import via URL*, and *Clone existing PVC* disks. These parameters are optional. If you do not specify these parameters, the system uses the default values from the `kubevirt-storage-class-defaults` config map.
+endif::[]
 
 [cols="2a,3a,5a"]
 |===
@@ -75,17 +78,29 @@ The following advanced storage settings are available for *Blank*, *Import via U
 |Block
 |Stores the virtual disk directly on the block volume. Only use `Block` if the underlying storage supports it.
 
+ifeval::["{context}" == "virt-importing-rhv-vm"]
+.3+|Access Mode ^[1]^
+endif::[]
+ifeval::["{context}" != "virt-importing-rhv-vm"]
 .3+|Access Mode
+endif::[]
 |Single User (RWO)
 |The disk can be mounted as read/write by a single node.
 
 |Shared Access (RWX)
 |The disk can be mounted as read/write by many nodes.
+ifeval::["{context}" != "virt-importing-rhv-vm"]
 [NOTE]
 ====
 This is required for some features, such as live migration of virtual machines between nodes.
 ====
+endif::[]
 
 |Read Only (ROX)
 |The disk can be mounted as read-only by many nodes.
 |===
+ifeval::["{context}" == "virt-importing-rhv-vm"]
+--
+1. You can change the access mode by using the command line interface.
+--
+endif::[]
