Merge pull request #33351 from ktania46/p

MULTIARCH-941: Power Updates OCP 4.8

Author: pneedle-rh

modules/installation-complete-user-infra.adoc

@@ -146,11 +146,16 @@ command.
 If the pod logs display, the Kubernetes API server can communicate with the
 cluster machines.
 
+ifndef::ibm-power[]
 . For an installation with Fibre Channel Protocol (FCP), additional steps are required to enable multipathing. Do not enable multipathing during installation.
 +
 See "Enabling multipathing with kernel arguments on RHCOS" in the _Post-installation configuration_ documentation for more information.
-
+endif::ibm-power[]
 ifdef::ibm-power[]
+. Additional steps are required to enable multipathing. Do not enable multipathing during installation.
++
+See "Enabling multipathing with kernel arguments on RHCOS" in the _Post-installation configuration_ documentation for more information.
+
 .. To display a boot list and specify the possible boot devices if the system is booted in normal mode, enter the following command:
 +
 [source,terminal]

modules/installation-user-infra-machines-pxe.adoc

@@ -7,16 +7,40 @@
 // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
 // * installing/installing_platform_agnostic/installing-platform-agnostic.adoc
 
+ifeval::["{context}" == "installing-ibm-power"]
+:ibm-power:
+:only-pxe:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
+:ibm-power:
+:only-pxe:
+endif::[]
+
 [id="installation-user-infra-machines-pxe_{context}"]
+ifndef::only-pxe[]
 = Installing {op-system} by using PXE or iPXE booting
+endif::only-pxe[]
+ifdef::only-pxe[]
+= Installing {op-system} by using PXE booting
+endif::only-pxe[]
 
+ifndef::only-pxe[]
 You can use PXE or iPXE booting to install {op-system} on the machines.
+endif::only-pxe[]
+ifdef::only-pxe[]
+You can use PXE booting to install {op-system} on the machines.
+endif::only-pxe[]
 
 .Prerequisites
 
 * You have created the Ignition config files for your cluster.
 * You have configured suitable network, DNS and load balancing infrastructure.
+ifndef::only-pxe[]
 * You have configured suitable PXE or iPXE infrastructure.
+endif::only-pxe[]
+ifdef::only-pxe[]
+* You have configured suitable PXE infrastructure.
+endif::only-pxe[]
 * You have an HTTP server that can be accessed from your computer, and from the machines that you create.
 * You have reviewed the _Advanced {op-system} installation configuration_ section for different ways to configure features, such as networking and disk partitioning.
 
@@ -92,12 +116,24 @@ installation, do not delete these files.
 . Configure the network boot infrastructure so that the machines boot from their
 local disks after {op-system} is installed on them.
 
+ifndef::only-pxe[]
 . Configure PXE or iPXE installation for the {op-system} images and begin the installation.
+endif::only-pxe[]
+ifdef::only-pxe[]
+. Configure PXE installation for the {op-system} images and begin the installation.
+endif::only-pxe[]
 +
+ifndef::only-pxe[]
 Modify one of the following example menu entries for your environment and verify
 that the image and Ignition files are properly accessible:
+endif::only-pxe[]
 
+ifdef::only-pxe[]
+Modify the following example menu entry for your environment and verify that the image and Ignition files are properly accessible:
+endif::only-pxe[]
+ifndef::only-pxe[]
 ** For PXE:
+endif::only-pxe[]
 +
 ----
 DEFAULT pxeboot
@@ -125,6 +161,7 @@ or other boot options.
 This configuration does not enable serial console access on machines with a graphical console.  To configure a different console, add one or more `console=` arguments to the `APPEND` line.  For example, add `console=tty0 console=ttyS0` to set the first PC serial port as the primary console and the graphical console as a secondary console.  For more information, see link:https://access.redhat.com/articles/7212[How does one set up a serial terminal and/or console in Red Hat Enterprise Linux?].
 ====
 
+ifndef::only-pxe[]
 ** For iPXE:
 +
 ----
@@ -146,6 +183,7 @@ For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
 ====
 This configuration does not enable serial console access on machines with a graphical console.  To configure a different console, add one or more `console=` arguments to the `kernel` line.  For example, add `console=tty0 console=ttyS0` to set the first PC serial port as the primary console and the graphical console as a secondary console.  For more information, see link:https://access.redhat.com/articles/7212[How does one set up a serial terminal and/or console in Red Hat Enterprise Linux?].
 ====
+endif::only-pxe[]
 
 . Monitor the progress of the {op-system} installation on the console of the machine.
 +
@@ -171,3 +209,12 @@ If the required network, DNS, and load balancer infrastructure are in place, the
 ====
 {op-system} nodes do not include a default password for the  `core` user. You can access the nodes by running `ssh core@<node>.<cluster_name>.<base_domain>` as a user with access to the SSH private key that is paired to the public key that you specified in your `install_config.yaml` file. {product-title} 4 cluster nodes running {op-system} are immutable and rely on Operators to apply cluster changes. Accessing cluster nodes by using SSH is not recommended. However, when investigating installation issues, if the {product-title} API is not available, or the kubelet is not properly functioning on a target node, SSH access might be required for debugging or disaster recovery.
 ====
+
+ifeval::["{context}" == "installing-ibm-power"]
+:!ibm-power:
+:!only-pxe:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
+:!ibm-power:
+:!only-pxe:
+endif::[]

modules/openshift-cluster-maximums-environment.adoc

@@ -56,3 +56,47 @@ AWS cloud platform:
 4. Larger disk size is used so that there is enough space to store the large amounts of data that is collected during the performance and scalability test run.
 5. Cluster is scaled in iterations and performance and scalability tests are executed at the specified node counts.
 --
+
+IBM Power Systems platform:
+
+[options="header",cols="6*"]
+|===
+| Node |vCPU |RAM(GiB) |Disk type|Disk size(GiB)/IOS |Count
+
+| Master/etcd ^[1]^
+| 16
+| 32
+| io1
+| 120 / 3 IOPS per GB
+| 3
+
+| Infra ^[2]^
+| 16
+| 64
+| gp2
+| 120
+| 2
+
+| Workload ^[3]^
+| 16
+| 256
+| gp2
+| 120 ^[4]^
+| 1
+
+| Worker
+| 16
+| 64
+| gp2
+| 120
+| 3/25/250/500 ^[5]^
+
+|===
+[.small]
+--
+1. io1 disks with 120 / 3 IOPS per GB are used for master/etcd nodes as etcd is I/O intensive and latency sensitive.
+2. Infra nodes are used to host Monitoring, Ingress, and Registry components to ensure they have enough resources to run at large scale.
+3. Workload node is dedicated to run performance and scalability workload generators.
+4. Larger disk size is used so that there is enough space to store the large amounts of data that is collected during the performance and scalability test run.
+5. Cluster is scaled in iterations and performance and scalability tests are executed at the specified node counts.
+--