openshift · ShaunaDiaz · Aug 14, 2024 · Jul 1, 2024
diff --git a/modules/ibmz-configure-nbde-with-static-ip.adoc b/modules/ibmz-configure-nbde-with-static-ip.adoc
@@ -118,40 +118,38 @@ Before first boot, you must customize the initramfs for each node in the cluster
 ifndef::ibm-z-kvm[]
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
-coreos.inst.install_dev=/dev/dasda \// <1>
+coreos.inst.install_dev=/dev/<block_device> \// <1>
 ignition.firstboot ignition.platform.id=metal \
-coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
-coreos.inst.ignition_url=http://<http_server>/master.ign \// <3>
-ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
-zfcp.allow_lun_scan=0 \// <4>
+coreos.inst.ignition_url=http://<http_server>/master.ign \// <2>
+coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <3>
+ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
 rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
-rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <5>
+rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \// <4>
+zfcp.allow_lun_scan=0
 ----
-<1> For installations on DASD-type disks, add `coreos.inst.install_dev=/dev/dasda`. Omit this value for FCP-type disks.
-<2> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
-<3> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
-<4> For installations on FCP-type disks, add `zfcp.allow_lun_scan=0`. Omit this value for DASD-type disks.
-<5> For installations on DASD-type disks, replace with `rd.dasd=0.0.3490` to specify the DASD device.
-
-
+<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
+<2> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
+<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
+<4> For installations on DASD-type disks, replace with `rd.dasd=0.0.xxxx` to specify the DASD device.
 endif::ibm-z-kvm[]
 ifdef::ibm-z-kvm[]
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
 ignition.firstboot ignition.platform.id=metal \
-coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <1>
-coreos.inst.ignition_url=http://<http_server>/master.ign \// <2>
-ip=10.19.17.2::10.19.17.1:255.255.255.0::enbdd0:none nameserver=10.19.17.1 \
-zfcp.allow_lun_scan=0 \
+coreos.inst.ignition_url=http://<http_server>/master.ign \// <1>
+coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
+ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
 rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
-rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000
+rd.zfcp=0.0.5677,0x600606680g7f0056,0x034F000000000000 \
+zfcp.allow_lun_scan=0
 ----
-<1> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
-<2> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
+<1> Specify the location of the Ignition config file. Use `master.ign` or `worker.ign`. Only HTTP and HTTPS protocols are supported.
+<2> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
+
 endif::ibm-z-kvm[]
 +
 [NOTE]

diff --git a/modules/install-sno-ibm-z-kvm.adoc b/modules/install-sno-ibm-z-kvm.adoc
@@ -159,15 +159,15 @@ $ virt-install \
    --network network=<virt_network_parm> \
    --graphics none \
    --noautoconsole \
-   --extra-args "ip=<ip>::<gateway>:<mask>:<hostname>::none" \
-   --extra-args "nameserver=<name_server>" \
-   --extra-args "ip=dhcp rd.neednet=1 ignition.platform.id=metal ignition.firstboot" \
-   --extra-args "coreos.live.rootfs_url=<rhcos_liveos>" \// <2>
-   --extra-args "ignition.config.url=<rhcos_ign>" \// <3>
-   --extra-args "random.trust_cpu=on rd.luks.options=discard" \
+   --extra-args "rd.neednet=1 ignition.platform.id=metal ignition.firstboot" \
+   --extra-args "ignition.config.url=http://<http_server>/bootstrap.ign" \// <2>
+   --extra-args "coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img" \// <3>
+   --extra-args "ip=<ip>::<gateway>:<mask>:<hostname>::none" \ <4>
+   --extra-args "nameserver=<dns>" \
    --extra-args "console=ttysclp0" \
    --wait
 ----
-<1> For the `--location` parameter, specify the location  of the kernel/initrd on the HTTP or HTTPS server.
-<2> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
-<3> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
+<1> For the `--location` parameter, specify the location of the kernel/initrd on the HTTP or HTTPS server.
+<2> Specify the location of the `bootstrap.ign` config file. Only HTTP and HTTPS protocols are supported.
+<3> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
+<4> For the `ip=` parameter, assign the IP address manually as described in "Installing a cluster with with {op-system-base} KVM on {ibm-z-name} and {ibm-linuxone-name}".
diff --git a/modules/install-sno-ibm-z.adoc b/modules/install-sno-ibm-z.adoc
@@ -150,20 +150,19 @@ The `rootfs` image is the same for FCP and DASD.
 +
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
-coreos.live.rootfs_url=<rhcos_liveos>:8080/rootfs.img \// <1>
 ignition.firstboot ignition.platform.id=metal \
-ignition.config.url=<rhcos_ign>:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <2>
-ip=encbdd0:dhcp::02:00:00:02:34:02 <3>
+ignition.config.url=http://<http_server>:8080/ignition/bootstrap-in-place-for-live-iso.ign \// <1>
+coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <2>
+ip=<ip>::<gateway>:<mask>:<hostname>::none nameserver=<dns> \// <3>
 rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \
 rd.dasd=0.0.4411 \// <4>
 rd.zfcp=0.0.8001,0x50050763040051e3,0x4000406300000000 \// <5>
-zfcp.allow_lun_scan=0 \
-rd.luks.options=discard
+zfcp.allow_lun_scan=0
 ----
-<1> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
-<2> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
+<1> For the `ignition.config.url=` parameter, specify the Ignition file for the machine role. Only HTTP and HTTPS protocols are supported.
+<2> For the `coreos.live.rootfs_url=` artifact, specify the matching `rootfs` artifact for the `kernel`and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
 <3> For the `ip=` parameter, assign the IP address automatically using DHCP or manually as described in "Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name}".
 <4> For installations on DASD-type disks, use `rd.dasd=` to specify the DASD where {op-system} is to be installed. Omit this entry for FCP-type disks.
 <5> For installations on FCP-type disks, use `rd.zfcp=<adapter>,<wwpn>,<lun>` to specify the FCP disk where {op-system} is to be installed. Omit this entry for DASD-type disks.

diff --git a/modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc b/modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc
@@ -40,22 +40,26 @@ The file names contain the {product-title} version number. They resemble the fol
 The Ignition files are generated by the {product-title} installer.
 ====
 . Create the new KVM guest nodes using the {op-system-base} kernel, initramfs, and Ignition files, the new disk image, and adjusted parm line arguments.
-** For `--location`, specify the location of the kernel/initrd on the HTTP or HTTPS server.
-** For `coreos.inst.ignition_url=`, specify the Ignition file for the machine role. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
-** For `coreos.live.rootfs_url=`, specify the matching rootfs artifact for the kernel and initramfs you are booting. Only HTTP and HTTPS protocols are supported.
 +
 [source,terminal]
 ----
 $ virt-install \
    --connect qemu:///system \
-   --name {vm_name} \
-   --vcpus {vcpus} \
-   --memory {memory_mb} \
-   --disk {vm_name}.qcow2,size={image_size| default(10,true)} \
-   --network network={virt_network_parm} \
+   --name <vm_name> \
+   --memory <memory_mb> \
+   --vcpus <vcpus> \
+   --location <media_location>,kernel=<rhcos_kernel>,initrd=<rhcos_initrd> \ / <1>
+   --disk <vm_name>.qcow2,size=<image_size>,cache=none,io=native \
+   --network network=<virt_network_parm> \
    --boot hd \
-   --location {media_location},kernel={rhcos_kernel},initrd={rhcos_initrd} \
-   --extra-args "rd.neednet=1 coreos.inst.install_dev=/dev/vda coreos.live.rootfs_url={rhcos_liveos} ip={ip}::{default_gateway}:{subnet_mask_length}:{vm_name}:enc1:none:{MTU} nameserver={dns} coreos.inst.ignition_url={rhcos_ign}" \
+   --extra-args "rd.neednet=1" \
+   --extra-args "coreos.inst.install_dev=/dev/<block_device>" \
+   --extra-args "coreos.inst.ignition_url=http://<http_server>/bootstrap.ign" \// <2>
+   --extra-args "coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img" \// <3>
+   --extra-args "ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns>" \
    --noautoconsole \
    --wait
 ----
+<1> For the `--location` parameter, specify the location of the kernel/initrd on the HTTP or HTTPS server.
+<2> Specify the location of the Ignition config file. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
+<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
diff --git a/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc b/modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc
@@ -48,14 +48,14 @@ $ qemu-img create -f qcow2 -F qcow2 -b /var/lib/libvirt/images/{source_rhcos_qem
 ----
 $ virt-install --noautoconsole \
    --connect qemu:///system \
-   --name {vm_name} \
-   --memory {memory} \
-   --vcpus {vcpus} \
-   --disk {disk} \
+   --name <vm_name> \
+   --memory <memory_mb> \
+   --vcpus <vcpus> \
+   --disk <disk> \
    --launchSecurity type="s390-pv" \ <1>
    --import \
-   --network network={network},mac={mac} \
-   --disk path={ign_file},format=raw,readonly=on,serial=ignition,startup_policy=optional <2>
+   --network network=<virt_network_parm>,mac=<mac_address> \
+   --disk path=<ign_file>,format=raw,readonly=on,serial=ignition,startup_policy=optional <2>
 ----
 <1> If {ibm-name} Secure Execution is enabled, add the `launchSecurity type="s390-pv"` parameter.
-<2> If {ibm-name} Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`.
+<2> If {ibm-name} Secure Execution is enabled, replace `serial=ignition` with `serial=ignition_crypted`.
diff --git a/modules/installation-ibm-z-user-infra-machines-iso.adoc b/modules/installation-ibm-z-user-infra-machines-iso.adoc
@@ -84,20 +84,21 @@ Example parameter file, `bootstrap-0.parm`, for the bootstrap machine:
 +
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
-coreos.inst.install_dev=/dev/dasda \
-coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <1>
+coreos.inst.install_dev=/dev/<block_device> \// <1>
 coreos.inst.ignition_url=http://<http_server>/bootstrap.ign \// <2>
-coreos.inst.secure_ipl \// <3>
-ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \
+coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \// <3>
+coreos.inst.secure_ipl \// <4>
+ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
 rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
-zfcp.allow_lun_scan=0 \
-rd.dasd=0.0.3490
+rd.dasd=0.0.3490 \
+zfcp.allow_lun_scan=0
 ----
-<1> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
+<1> Specify the block device type. For installations on DASD-type disks, specify `/dev/dasda`. For installations on FCP-type disks, specify `/dev/sda`.
 <2> Specify the location of the Ignition config file. Use `bootstrap.ign`, `master.ign`, or `worker.ign`. Only HTTP and HTTPS protocols are supported.
-<3> Optional: To enable secure boot, add `coreos.inst.secure_ipl`.
+<3> Specify the location of the `rootfs` artifact for the `kernel` and `initramfs` you are booting. Only HTTP and HTTPS protocols are supported.
+<4> Optional: To enable secure boot, add `coreos.inst.secure_ipl`.
 +
 Write all options in the parameter file as a single line and make sure you have no newline characters.
 
@@ -126,18 +127,18 @@ The following is an example parameter file `worker-1.parm` for a compute node wi
 +
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
 coreos.inst.install_dev=/dev/disk/by-id/scsi-<serial_number> \
 coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
 coreos.inst.ignition_url=http://<http_server>/worker.ign \
-ip=172.18.78.2::172.18.78.1:255.255.255.0:::none nameserver=172.18.78.1 \
+ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
 rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
-zfcp.allow_lun_scan=0 \
 rd.zfcp=0.0.1987,0x50050763070bc5e3,0x4008400B00000000 \
 rd.zfcp=0.0.19C7,0x50050763070bc5e3,0x4008400B00000000 \
 rd.zfcp=0.0.1987,0x50050763071bc5e3,0x4008400B00000000 \
-rd.zfcp=0.0.19C7,0x50050763071bc5e3,0x4008400B00000000
+rd.zfcp=0.0.19C7,0x50050763071bc5e3,0x4008400B00000000 \
+zfcp.allow_lun_scan=0
 ----
 +
 Write all options in the parameter file as a single line and make sure you have no newline characters.

diff --git a/modules/machine-user-infra-machines-ibm-z.adoc b/modules/machine-user-infra-machines-ibm-z.adoc
@@ -99,15 +99,15 @@ The following is an example parameter file, `additional-worker-dasd.parm`:
 +
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
 coreos.inst.install_dev=/dev/dasda \
-coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
 coreos.inst.ignition_url=http://<http_server>/worker.ign \
+coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \
 ip=<ip>::<gateway>:<netmask>:<hostname>::none nameserver=<dns> \
 rd.znet=qeth,0.0.bdf0,0.0.bdf1,0.0.bdf2,layer2=1,portno=0 \
-zfcp.allow_lun_scan=0 \
-rd.dasd=0.0.3490
+rd.dasd=0.0.3490 \
+zfcp.allow_lun_scan=0
 ----
 +
 Write all options in the parameter file as a single line and make sure that you have no newline characters.
@@ -137,7 +137,7 @@ The following is an example parameter file, `additional-worker-fcp.parm` for a w
 +
 [source,terminal]
 ----
-rd.neednet=1 \
+cio_ignore=all,!condev rd.neednet=1 \
 console=ttysclp0 \
 coreos.inst.install_dev=/dev/sda \
 coreos.live.rootfs_url=http://<http_server>/rhcos-<version>-live-rootfs.<architecture>.img \