Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions _attributes/common-attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,5 @@ endif::[]
:SMProductVersion1x: 1.1.18
//Windows containers
:productwinc: Red Hat OpenShift support for Windows Containers
// IBM zSystems
:ibmzProductName: IBM Z
14 changes: 7 additions & 7 deletions modules/installation-requirements-user-infra-ibm-z-kvm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ See link:https://access.redhat.com/articles/rhel-limits[Red Hat Enterprise Linux
The {product-title} installer creates the Ignition files, which are necessary for all the {op-system-first} virtual machines. The automated installation of {product-title} is performed by the bootstrap machine. It starts the installation of {product-title} on each node, starts the Kubernetes cluster, and then finishes. During this bootstrap, the virtual machine must have an established network connection either through a Dynamic Host Configuration Protocol (DHCP) server or static IP address.

[id="ibm-z-network-connectivity_{context}"]
== IBM Z network connectivity requirements
== {ibmzProductName} network connectivity requirements

To install on IBM Z under {op-system-base} KVM, you need:
To install on {ibmzProductName} under {op-system-base} KVM, you need:

* A {op-system-base} KVM host configured with an OSA or RoCE network adapter.
* Either a {op-system-base} KVM host that is configured to use bridged networking in libvirt or MacVTap to connect the network to the guests.
Expand All @@ -65,21 +65,21 @@ The {op-system-base} KVM host in your environment must meet the following requir

You can install {product-title} version {product-version} on the following IBM hardware:

* IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
* LinuxONE, any version

[id="minimum-ibm-z-system-requirements_{context}"]
== Minimum IBM Z system environment
== Minimum {ibmzProductName} system environment

[discrete]
=== Hardware requirements

* The equivalent of six IFLs, which are SMT2 enabled, for each cluster.
* The equivalent of six Integrated Facilities for Linux (IFL), which are SMT2 enabled, for each cluster.
* At least one network connection to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.

[NOTE]
====
You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of IBM Z. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster.
You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmzProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the first usage of IFL be spelled out? (I don't think this is the first usage, but I didn't find it spelled out in the other instances, either.)

====

[IMPORTANT]
Expand Down Expand Up @@ -140,7 +140,7 @@ Each cluster virtual machine must meet the following minimum requirements:
--

[id="preferred-ibm-z-system-requirements_{context}"]
== Preferred IBM Z system environment
== Preferred {ibmzProductName} system environment

[discrete]
=== Hardware requirements
Expand Down
18 changes: 9 additions & 9 deletions modules/minimum-ibm-z-system-requirements.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@

:_content-type: CONCEPT
[id="minimum-ibm-z-system-requirements_{context}"]
= Minimum IBM Z system environment
= Minimum {ibmzProductName} system environment

You can install {product-title} version {product-version} on the following IBM hardware:

* IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
* LinuxONE, any version

[discrete]
== Hardware requirements

* The equivalent of 6 IFLs, which are SMT2 enabled, for each cluster.
* The equivalent of six Integrated Facilities for Linux (IFL), which are SMT2 enabled, for each cluster.
* At least one network connection to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.

[NOTE]
====
You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of IBM Z. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster.
You can use dedicated or shared IFLs to assign sufficient compute resources. Resource sharing is one of the key strengths of {ibmzProductName}. However, you must adjust capacity correctly on each hypervisor layer and ensure sufficient resources for every {product-title} cluster.
====

[IMPORTANT]
Expand All @@ -35,14 +35,14 @@ Since the overall performance of the cluster can be impacted, the LPARs that are

On your z/VM instance, set up:

* 3 guest virtual machines for {product-title} control plane machines
* 2 guest virtual machines for {product-title} compute machines
* 1 guest virtual machine for the temporary {product-title} bootstrap machine
* Three guest virtual machines for {product-title} control plane machines
* Two guest virtual machines for {product-title} compute machines
* One guest virtual machine for the temporary {product-title} bootstrap machine

[discrete]
== IBM Z network connectivity requirements
== {ibmzProductName} network connectivity requirements

To install on IBM Z under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need:
To install on {ibmzProductName} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need:

* A direct-attached OSA or RoCE network adapter
* A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation.
Expand Down