Peer review comments

Author: Audrey Spaulding

_topic_maps/_topic_map.yml

@@ -3621,8 +3621,6 @@ Topics:
       File: virt-tls-certificates-for-dv-imports
     - Name: Importing virtual machine images with data volumes
       File: virt-importing-virtual-machine-images-datavolumes
-    - Name: Importing virtual machine images into block storage with data volumes
-      File: virt-importing-virtual-machine-images-datavolumes-block
 # Cloning virtual machines
   - Name: Cloning virtual machines
     Dir: cloning_vms

modules/virt-about-block-pvs.adoc

@@ -2,7 +2,7 @@
 //
 // * virt/virtual_machines/virtual_disks/virt-uploading-local-disk-images-block.adoc
 // * virt/virtual_machines/cloning_vms/virt-cloning-vm-disk-into-new-datavolume-block.adoc
-// * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes-block.adoc
+// * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes.adoc
 
 :_content-type: CONCEPT
 [id="virt-about-block-pvs_{context}"]

modules/virt-about-datavolumes.adoc

@@ -10,7 +10,7 @@
 // * virt/virtual_machines/cloning_vms/virt-enabling-user-permissions-to-clone-datavolumes.adoc
 // * virt/virtual_machines/cloning_vms/virt-cloning-vm-disk-into-new-datavolume-block.adoc
 // * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes.adoc
-// * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes-block.adoc
+
 
 
 :_content-type: CONCEPT

modules/virt-creating-local-block-pv.adoc

@@ -2,12 +2,14 @@
 //
 // * virt/virtual_machines/virtual_disks/virt-uploading-local-disk-images-block.adoc
 // * virt/virtual_machines/cloning_vms/virt-cloning-vm-disk-into-new-datavolume-block.adoc
-// * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes-block.adoc
+// * virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes.adoc
 
 :_content-type: PROCEDURE
 [id="virt-creating-local-block-pv_{context}"]
 = Creating a local block persistent volume
 
+If you intend to import a virtual machine image into block storage with a data volume, you must have an available local block persistent volume.
+
 Create a local block persistent volume (PV) on a node by populating a file and
 mounting it as a loop device. You can then reference this loop device in a
 PV manifest as a `Block` volume and use it as a block device for a

modules/virt-importing-vm-datavolume.adoc

@@ -68,15 +68,21 @@ spec:
       name: fedora-dv <2>
     spec:
       storage:
+        volumeMode: Block <3>
         resources:
           requests:
             storage: 10Gi
         storageClassName: local
-      source:
-        http: <3>
+      source: <4>
+        http: 
           url: "https://mirror.arizona.edu/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2" <4>
           secretRef: endpoint-secret <5>
           certConfigMap: "" <6>
+        # To use a registry source, uncomment the following lines and delete the preceding HTTP source block
+        # registry:
+          # url: "docker://kubevirt/fedora-cloud-container-disk-demo:latest"
+          # secretRef: registry-secret <5>
+          # certConfigMap: "" <6>
     status: {}
   running: true
   template:
@@ -105,8 +111,8 @@ status: {}
 ----
 <1> Specify the name of the virtual machine.
 <2> Specify the name of the data volume.
-<3> Specify `http` for an HTTP or HTTPS endpoint. Specify `registry` for a container disk image imported from a registry.
-<4> Specify the URL or registry endpoint of the virtual machine image you want to import. This example references a virtual machine image at an HTTPS endpoint. An example of a container registry endpoint is `url: "docker://kubevirt/fedora-cloud-container-disk-demo:latest"`.
+<3> The volume and access mode are detected automatically for known storage provisioners. Alternatively, you can specify `Block`.
+<4> Specify either the URL or the registry endpoint of the virtual machine image you want to import using the comment block. For example, if you want to use a registry source, you can comment out or delete the the HTTP or HTTPS source block. Ensure that you replace the example values shown here with your own values.
 <5> Specify the `Secret` name if you created a `Secret` for the data source.
 <6> Optional: Specify a CA certificate config map.
 ====

virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes-block.adoc

@@ -6,7 +6,7 @@ include::_attributes/common-attributes.adoc[]
 
 toc::[]
 
-Use the Containerized Data Importer (CDI) to import a virtual machine image into a persistent volume claim (PVC) by using a data volume. You can attach a data volume to a virtual machine for persistent storage.
+You can import an existing virtual machine image into your {product-title} cluster storage. Using the Containerized Data Importer (CDI), you can import the image into a persistent volume claim (PVC) by using a data volume. {VirtProductName} uses one or more data volumes to automate the data import and the creation of an underlying PVC. You can attach a data volume to a virtual machine for persistent storage.
 
 The virtual machine image can be hosted at an HTTP or HTTPS endpoint, or built into a container disk and stored in a container registry.
 
@@ -30,6 +30,9 @@ in the same namespace as the data volume and referenced in the data volume confi
 * You might need to xref:../../../virt/virtual_machines/virtual_disks/virt-preparing-cdi-scratch-space.adoc#virt-defining-storageclass_virt-preparing-cdi-scratch-space[define a storage class or prepare CDI scratch space]
 for this operation to complete successfully.
 
+If you intend to import a virtual machine image into block storage with a data volume, you must have an available xref:../../../virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes.adoc#virt-creating-local-block-pv_virt-importing-virtual-machine-images-datavolumes[local block persistent volume].
+
+
 include::modules/virt-cdi-supported-operations-matrix.adoc[leveloffset=+1]
 
 [NOTE]
@@ -39,6 +42,16 @@ CDI now uses the {product-title} xref:../../../networking/enable-cluster-wide-pr
 
 include::modules/virt-about-datavolumes.adoc[leveloffset=+1]
 
+[id="local-block-persistent-volumes"]
+== Local block persistent volumes
+
+If you intend to import a virtual machine image into block storage with a data volume, you must have an available local block persistent volume.
+
+
+include::modules/virt-about-block-pvs.adoc[leveloffset=+2]
+
+include::modules/virt-creating-local-block-pv.adoc[leveloffset=+2]
+
 include::modules/virt-importing-vm-datavolume.adoc[leveloffset=+1]
 
 [id="{context}_additional-resources"]

virt/virtual_machines/importing_vms/virt-importing-virtual-machine-images-datavolumes.adoc

@@ -36,7 +36,7 @@ include::modules/virt-supported-tekton-tasks.adoc[leveloffset=+1]
 
 The Tekton Tasks Operator includes the following example `Pipeline` manifests. You can run the example pipelines by using the web console or CLI.
 
-Windows 10 installer pipeline:: This pipeline installs Windows 10 into a new data volume from a Windows installation image (ISO file). A custom answer file is used to run the installation process.
+Windows 10 installer pipeline:: This pipeline installs Windows 10 into a new PVC from a Windows installation image (ISO file). A custom answer file is used to run the installation process.
 
 Windows 10 customize pipeline:: This pipeline clones the data volume of a basic Windows 10 installation, customizes it by installing Microsoft SQL Server Express, and then creates a new image and template.