Virt, DPDK Checkup: Update image building scripts

Signed-off-by: Ram Lavi <[email protected]>

Author: RamLavi

modules/virt-building-vm-containerdisk-image.adoc

@@ -55,6 +55,10 @@ description = "Image to use with the DPDK checkup"
 version = "0.0.1"
 distro = "rhel-87"
 
+[[customizations.user]]
+name = "root"
+password = "redhat"
+
 [[packages]]
 name = "dpdk"
 
@@ -68,7 +72,7 @@ name = "driverctl"
 name = "tuned-profiles-cpu-partitioning"
 
 [customizations.kernel]
-append = "default_hugepagesz=1GB hugepagesz=1G hugepages=8 isolcpus=2-7"
+append = "default_hugepagesz=1GB hugepagesz=1G hugepages=1"
 
 [customizations.services]
 disabled = ["NetworkManager-wait-online", "sshd"]
@@ -108,28 +112,26 @@ EOF
 [source,terminal]
 ----
 $ cat <<EOF >customize-vm
-echo  isolated_cores=2-7 > /etc/tuned/cpu-partitioning-variables.conf
-tuned-adm profile cpu-partitioning
+#!/bin/bash
+
+# Setup hugepages mount
+mkdir -p /mnt/huge
+echo "hugetlbfs /mnt/huge hugetlbfs defaults,pagesize=1GB 0 0" >> /etc/fstab
+
+# Create vfio-noiommu.conf
 echo "options vfio enable_unsafe_noiommu_mode=1" > /etc/modprobe.d/vfio-noiommu.conf
-EOF
-----
-+
-[source,terminal]
-----
-$ cat <<EOF >first-boot
-driverctl set-override 0000:06:00.0 vfio-pci
-driverctl set-override 0000:07:00.0 vfio-pci
 
-mkdir /mnt/huge
-mount /mnt/huge --source nodev -t hugetlbfs -o pagesize=1GB
+# Enable guest-exec,guest-exec-status on the qemu-guest-agent configuration
+sed -i '/^BLACKLIST_RPC=/ { s/guest-exec-status//; s/guest-exec//g }' /etc/sysconfig/qemu-ga
+sed -i '/^BLACKLIST_RPC=/ { s/,\+/,/g; s/^,\|,$//g }' /etc/sysconfig/qemu-ga
 EOF
 ----
 
 . Use the `virt-customize` tool to customize the image generated by the image builder tool:
 +
 [source,terminal]
 ----
-$ virt-customize -a <UUID>.qcow2 --run=customize-vm --firstboot=first-boot --selinux-relabel
+$ virt-customize -a <UUID>.qcow2 --run=customize-vm --selinux-relabel
 ----
 
 . To create a Dockerfile that contains all the commands to build the container disk image, enter the following command:
@@ -138,7 +140,7 @@ $ virt-customize -a <UUID>.qcow2 --run=customize-vm --firstboot=first-boot --sel
 ----
 $ cat << EOF > Dockerfile
 FROM scratch
-COPY <uuid>-disk.qcow2 /disk/
+COPY --chown=107:107 <uuid>-disk.qcow2 /disk/
 EOF
 ----
 +
@@ -160,4 +162,4 @@ $ podman build . -t dpdk-rhel:latest
 $ podman push dpdk-rhel:latest
 ----
 
-. Provide a link to the container disk image in the `spec.param.vmContainerDiskImage` attribute in the DPDK checkup config map.
+. Provide a link to the container disk image in the `spec.param.vmUnderTestContainerDiskImage` attribute in the DPDK checkup config map.