diff --git a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc index 4668bc939e..35cf2fb610 100644 --- a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc @@ -123,13 +123,6 @@ include::modules/installation-registry-storage-non-production.adoc[leveloffset=+ include::modules/installation-complete-user-infra.adoc[leveloffset=+1] -include::modules/cluster-telemetry.adoc[leveloffset=+1] - -[role="_additional-resources"] -.Additional resources - -* See xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service - == Next steps * xref:../../post_installation_configuration/machine-configuration-tasks.adoc#rhcos-enabling-multipath_post-install-machine-configuration-tasks[Enabling multipathing with kernel arguments on {op-system}]. diff --git a/modules/installation-machine-requirements.adoc b/modules/installation-machine-requirements.adoc index 53a417de42..8435cc6cbb 100644 --- a/modules/installation-machine-requirements.adoc +++ b/modules/installation-machine-requirements.adoc @@ -45,6 +45,12 @@ endif::[] ifeval::["{context}" == "installing-restricted-networks-vsphere"] :vsphere: endif::[] +ifeval::["{context}" == "installing-ibm-power"] +:ibm-power: +endif::[] +ifeval::["{context}" == "installing-restricted-networks-ibm-power"] +:ibm-power: +endif::[] [id="installation-machine-requirements_{context}"] = Required machines for cluster installation @@ -88,7 +94,12 @@ these cluster machines. endif::ibm-z[] ==== +ifndef::ibm-z,ibm-power[] The bootstrap and control plane machines must use {op-system-first} as the operating system. However, the compute machines can choose between {op-system-first}, {op-system-base-full} 8.4, or {op-system-base} 8.5. +endif::ibm-z,ibm-power[] +ifdef::ibm-z,ibm-power[] +The bootstrap, control plane, and compute machines must use {op-system-first} as the operating system. +endif::ibm-z,ibm-power[] ifndef::openshift-origin[] Note that {op-system} is based on {op-system-base-full} 8 and inherits all of its hardware certifications and requirements. @@ -126,3 +137,9 @@ endif::[] ifeval::["{context}" == "installing-restricted-networks-vsphere"] :!vsphere: endif::[] +ifeval::["{context}" == "installing-ibm-power"] +:!ibm-power: +endif::[] +ifeval::["{context}" == "installing-restricted-networks-ibm-power"] +:!ibm-power: +endif::[] \ No newline at end of file diff --git a/modules/installation-minimum-resource-requirements.adoc b/modules/installation-minimum-resource-requirements.adoc index 2a62dfe8f6..76373c0c89 100644 --- a/modules/installation-minimum-resource-requirements.adoc +++ b/modules/installation-minimum-resource-requirements.adoc @@ -172,10 +172,13 @@ endif::bare-metal[] ifndef::ibm-z,bare-metal[] 1. One vCPU is equivalent to one physical core when simultaneous multithreading (SMT), or hyperthreading, is not enabled. When enabled, use the following formula to calculate the corresponding ratio: (threads per core × cores) × sockets = vCPUs. endif::ibm-z,bare-metal[] -ifndef::ibm-z[] +ifndef::ibm-z,ibm-power[] 2. {product-title} and Kubernetes are sensitive to disk performance, and faster storage is recommended, particularly for etcd on the control plane nodes which require a 10 ms p99 fsync duration. Note that on many cloud platforms, storage size and IOPS scale together, so you might need to over-allocate storage volume to obtain sufficient performance. 3. As with all user-provisioned installations, if you choose to use {op-system-base} compute machines in your cluster, you take responsibility for all operating system life cycle management and maintenance, including performing system updates, applying patches, and completing all other required tasks. Use of {op-system-base} 7 compute machines is deprecated and planned for removal in a future release of {product-title} 4. -endif::ibm-z[] +endif::ibm-z,ibm-power[] +ifdef::ibm-power[] +2. {product-title} and Kubernetes are sensitive to disk performance, and faster storage is recommended, particularly for etcd on the control plane nodes. Note that on many cloud platforms, storage size and IOPS scale together, so you might need to over-allocate storage volume to obtain sufficient performance. +endif::ibm-power[] -- ifdef::azure[] diff --git a/modules/minimum-ibm-power-system-requirements.adoc b/modules/minimum-ibm-power-system-requirements.adoc index 797422e554..de945a8c6b 100644 --- a/modules/minimum-ibm-power-system-requirements.adoc +++ b/modules/minimum-ibm-power-system-requirements.adoc @@ -30,12 +30,13 @@ On your IBM Power instance, set up: [discrete] == Disk storage for the IBM Power guest virtual machines -* Storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) +* Local storage, or storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) [discrete] == Network for the PowerVM guest virtual machines -* Virtualized by the Virtual I/O Server using Shared Ethernet Adapter +* Dedicated physical adapter, or SR-IOV virtual function +* Available by the Virtual I/O Server using Shared Ethernet Adapter * Virtualized by the Virtual I/O Server using IBM vNIC [discrete] diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index 304c36ec5a..c6ee3e3dfe 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -332,7 +332,7 @@ ifdef::operator[] NOTE: You can only change the configuration for your cluster network provider during cluster installation, except for the `gatewayConfig` field that can be changed at runtime as a post-installation activity. endif::operator[] -.Example OVN-Kubernetes configuration +.Example OVN-Kubernetes configuration with IPSec enabled [source,yaml] ---- defaultNetwork: diff --git a/modules/recommended-ibm-power-system-requirements.adoc b/modules/recommended-ibm-power-system-requirements.adoc index 67c951ed68..f36785cd26 100644 --- a/modules/recommended-ibm-power-system-requirements.adoc +++ b/modules/recommended-ibm-power-system-requirements.adoc @@ -26,12 +26,13 @@ On your IBM Power instance, set up: [discrete] == Disk storage for the IBM Power guest virtual machines -* Storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) +* Local storage, or storage provisioned by the Virtual I/O Server using vSCSI, NPIV (N-Port ID Virtualization) or SSP (shared storage pools) [discrete] == Network for the PowerVM guest virtual machines -* Virtualized by the Virtual I/O Server using Shared Ethernet Adapter +* Dedicated physical adapter, or SR-IOV virtual function +* Available by the Virtual I/O Server using Shared Ethernet Adapter * Virtualized by the Virtual I/O Server using IBM vNIC [discrete]