remove step to disable udp aggregation

Author: SNiemann15

modules/machine-user-infra-machines-ibm-z-kvm.adoc

@@ -16,31 +16,6 @@ You can create more {op-system-first} compute machines for your cluster by using
 * An HTTP or HTTPS server is set up.
 
 .Procedure
-// Step 1 is a workaround for https://issues.redhat.com/browse/OCPBUGS-18394
-// Can be removed when bug is fixed.
-. Disable UDP aggregation.
-+
-Currently, UDP aggregation is not supported on {ibm-z-name} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation.
-
-.. Create a YAML file `udp-aggregation-config.yaml` with the following content:
-+
-[source,yaml]
-----
-apiVersion: v1
-kind: ConfigMap
-data:
-  disable-udp-aggregation: "true"
-metadata:
-  name: udp-aggregation-config
-  namespace: openshift-network-operator
-----
-
-.. Create the ConfigMap resource by running the following command:
-+
-[source,terminal]
-----
-$ oc create -f udp-aggregation-config.yaml
-----
 
 . Extract the Ignition config file from the cluster by running the following command:
 +
@@ -78,7 +53,7 @@ $ curl -LO $(oc -n openshift-machine-config-operator get configmap/coreos-bootim
 | jq -r '.architectures.s390x.artifacts.metal.formats.pxe.rootfs.location')
 ----
 
-. Move the downloaded {op-system-base} live `kernel`, `initramfs` and `rootfs` files to an HTTP or HTTPS server before you launch `virt-install`.
+. Move the downloaded {op-system-base} live `kernel`, `initramfs`, and `rootfs` files to an HTTP or HTTPS server before you launch `virt-install`.
 
 . 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.
 +

modules/machine-user-infra-machines-ibm-z.adoc

@@ -1,44 +1,32 @@
 // Module included in the following assemblies:
 //
 // * post_installation_configuration/configuring-multi-arch-compute-machines/creating-multi-arch-compute-nodes-ibm-z.adoc
-
+ifeval::["{context}" == "creating-multi-arch-compute-nodes-ibm-z"]
+:ibm-z:
+endif::[]
+ifeval::["{context}" == "creating-multi-arch-compute-nodes-ibm-z-lpar"]
+:ibm-z-lpar:
+endif::[]
 :_mod-docs-content-type: PROCEDURE
+// Assumption is that attribute once outside ifdef works for several level one headings.
 [id="machine-user-infra-machines-ibm-z_{context}"]
+ifdef::ibm-z[]
 = Creating {op-system} machines on {ibm-z-title} with z/VM
 
 You can create more {op-system-first} compute machines running on {ibm-z-name} with z/VM and attach them to your existing cluster.
+endif::ibm-z[]
+ifdef::ibm-z-lpar[]
+= Creating {op-system} machines on {ibm-z-title} in an LPAR
+
+You can create more {op-system-first} compute machines running on {ibm-z-name} in a logical partition (LPAR) and attach them to your existing cluster.
+endif::ibm-z-lpar[]
 
 .Prerequisites
 
 * You have a domain name server (DNS) that can perform hostname and reverse lookup for the nodes.
 * You have an HTTP or HTTPS server running on your provisioning machine that is accessible to the machines you create.
 
 .Procedure
-// Step 1 is a workaround for https://issues.redhat.com/browse/OCPBUGS-18394
-// Can be removed when bug is fixed.
-. Disable UDP aggregation.
-+
-Currently, UDP aggregation is not supported on {ibm-z-name} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation.
-
-.. Create a YAML file `udp-aggregation-config.yaml` with the following content:
-+
-[source,yaml]
-----
-apiVersion: v1
-kind: ConfigMap
-data:
-  disable-udp-aggregation: "true"
-metadata:
-  name: udp-aggregation-config
-  namespace: openshift-network-operator
-----
-
-.. Create the ConfigMap resource by running the following command:
-+
-[source,terminal]
-----
-$ oc create -f udp-aggregation-config.yaml
-----
 
 . Extract the Ignition config file from the cluster by running the following command:
 +
@@ -76,9 +64,9 @@ $ curl -LO $(oc -n openshift-machine-config-operator get configmap/coreos-bootim
 | jq -r '.architectures.s390x.artifacts.metal.formats.pxe.rootfs.location')
 ----
 
-. Move the downloaded {op-system-base} live `kernel`, `initramfs`, and `rootfs` files to an HTTP or HTTPS server that is accessible from the z/VM guest you want to add.
+. Move the downloaded {op-system-base} live `kernel`, `initramfs`, and `rootfs` files to an HTTP or HTTPS server that is accessible from the {op-system} guest you want to add.
 
-. Create a parameter file for the z/VM guest. The following parameters are specific for the virtual machine:
+. Create a parameter file for the guest. The following parameters are specific for the virtual machine:
 ** Optional: To specify a static IP address, add an `ip=` parameter with the following entries, with each separated by a colon:
 ... The IP address for the machine.
 ... An empty string.
@@ -129,7 +117,7 @@ If additional LUNs are configured with NPIV, FCP requires `zfcp.allow_lun_scan=0
 +
 [IMPORTANT]
 ====
-Additional postinstallation steps are required to fully enable multipathing. For more information, see “Enabling multipathing with kernel arguments on {op-system}" in _Postinstallation machine configuration tasks_.
+Additional postinstallation steps are required to fully enable multipathing. For more information, see “Enabling multipathing with kernel arguments on {op-system}" in _Machine configuration_.
 ====
 // Add xref once it's allowed.
 +
@@ -152,8 +140,8 @@ rd.zfcp=0.0.19C7,0x50050763071bc5e3,0x4008400B00000000
 ----
 +
 Write all options in the parameter file as a single line and make sure that you have no newline characters.
-
-. Transfer the `initramfs`, `kernel`, parameter files, and {op-system} images to z/VM, for example, by using FTP. For details about how to transfer the files with FTP and boot from the virtual reader, see link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/installation_guide/sect-installing-zvm-s390[Installing under Z/VM].
+ifdef::ibm-z[]
+. Transfer the `initramfs`, `kernel`, parameter files, and {op-system} images to z/VM, for example, by using FTP. For details about how to transfer the files with FTP and boot from the virtual reader, see link:https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html-single/interactively_installing_rhel_over_the_network/index#installing-under-z-vm_booting-the-installation-media[Booting the installation on {ibm-z-name} to install {op-system-base} in z/VM].
 . Punch the files to the virtual reader of the z/VM guest virtual machine.
 +
 See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-punch[PUNCH] in {ibm-name} Documentation.
@@ -171,3 +159,16 @@ $ ipl c
 ----
 +
 See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] in {ibm-name} Documentation.
+endif::ibm-z[]
+ifdef::ibm-z-lpar[]
+. Transfer the initramfs, kernel, parameter files, and {op-system} images to the LPAR, for example with FTP. For details about how to transfer the files with FTP and boot, see link:https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html-single/interactively_installing_rhel_over_the_network/index#installing-in-an-lpar_booting-the-installation-media[Booting the installation on {ibm-z-name} to install {op-system-base} in an LPAR].
+
+. Boot the machine
+endif::ibm-z-lpar[]
+
+ifeval::["{context}" == "creating-multi-arch-compute-nodes-ibm-z"]
+:!ibm-z:
+endif::[]
+ifeval::["{context}" == "creating-multi-arch-compute-nodes-ibm-z-lpar"]
+:!ibm-z-lpar:
+endif::[]