add further QE review changes

modules/ibmz-configure-nbde-with-static-ip.adoc

@@ -45,16 +45,11 @@ metadata:
   labels:
     machineconfiguration.openshift.io/role: master
 storage:
-  filesystems:
-    - device: /dev/mapper/root
-      format: xfs
-      label: root
-      wipe_filesystem: true
   luks:
     - clevis:
         tang:
           - thumbprint: QcPr_NHFJammnRCA3fFMVdNBwjs
-            url: http://12.23.21.58:7500
+            url: http://<clevis.example.com>:7500
 ifndef::ibm-z-kvm[]
       device: /dev/disk/by-partlabel/root <1>
 endif::ibm-z-kvm[]
@@ -64,8 +59,11 @@ endif::ibm-z-kvm[]
       label: luks-root
       name: root
       wipe_volume: true
-openshift:
-  fips: true
+  filesystems:
+    - device: /dev/mapper/root
+      format: xfs
+      label: root
+      wipe_filesystem: true
 ----
 ifndef::ibm-z-kvm[]
 <1> For installations on DASD-type disks, replace with `device: /dev/disk/by-label/root`.
@@ -83,13 +81,11 @@ $ coreos-installer pxe customize \
     --dest-karg-append rd.neednet=1 -o \
     /root/rhcos-bootfiles/<Node-name>-initramfs.s390x.img
 ----
-ifndef::ibm-z-kvm[]
 +
 [NOTE]
 ====
 Before first boot, you must customize the initramfs for each node in the cluster and add PXE kernel parameters.
 ====
-endif::ibm-z-kvm[]
 
 . Create a parameter file that includes `ignition.platform.id=metal` and `ignition.firstboot`.
 +
@@ -121,7 +117,8 @@ ifdef::ibm-z-kvm[]
 rd.neednet=1 \
 console=ttysclp0 \
 ignition.firstboot ignition.platform.id=metal \
-coreos.live.rootfs_url=http://10.19.17.25/redhat/ocp/rhcos-413.86.202302201445-0/rhcos-413.86.202302201445-0-live-rootfs.s390x.img \ coreos.inst.ignition_url=http://bastion.ocp-cluster1.example.com:8080/ignition/master.ign \
+coreos.live.rootfs_url=http://10.19.17.25/redhat/ocp/rhcos-413.86.202302201445-0/rhcos-413.86.202302201445-0-live-rootfs.s390x.img \
+coreos.inst.ignition_url=http://bastion.ocp-cluster1.example.com:8080/ignition/master.ign \
 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 \
 rd.znet=qeth,0.0.bdd0,0.0.bdd1,0.0.bdd2,layer2=1 \

modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc

@@ -55,7 +55,7 @@ $ virt-install \
    --network network={virt_network_parm} \
    --boot hd \
    --location {media_location},kernel={rhcos_kernel},initrd={rhcos_initrd} \
-   --extra-args "rd.neednet=1 coreos.inst=yes coreos.inst.install_dev=/dev/vda coreos.live.rootfs_url={rhcos_liveos} ip={ip}::{default_gateway}:{subnet_mask_length}:{vn_name}:enc1:none:{MTU} nameserver={dns} coreos.inst.ignition_url={rhcos_ign}" \
+   --extra-args "rd.neednet=1 coreos.inst.install_dev=/dev/vda coreos.live.rootfs_url={rhcos_liveos} ip={ip}::{default_gateway}:{subnet_mask_length}:{vn_name}:enc1:none:{MTU} nameserver={dns} coreos.inst.ignition_url={rhcos_ign}" \
    --noautoconsole \
    --wait
 ----