Skip to content

Commit 9c1d687

Browse files
authored
Merge pull request #44570 from openshift-cherrypick-robot/cherry-pick-44567-to-enterprise-4.10
[enterprise-4.10] MULTIARCH-1430 Add IBM z16 as supported model
2 parents 5ba77ad + 170e25e commit 9c1d687

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

_attributes/common-attributes.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,5 @@ endif::[]
102102
:SMProductVersion1x: 1.1.18
103103
//Windows containers
104104
:productwinc: Red Hat OpenShift support for Windows Containers
105+
// IBM zSystems
106+
:ibmzProductName: IBM Z

modules/installation-requirements-user-infra-ibm-z-kvm.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ See link:https://access.redhat.com/articles/rhel-limits[Red Hat Enterprise Linux
5050
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.
5151

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

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

5757
* A {op-system-base} KVM host configured with an OSA or RoCE network adapter.
5858
* 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.
@@ -65,21 +65,21 @@ The {op-system-base} KVM host in your environment must meet the following requir
6565

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

68-
* IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
68+
* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
6969
* LinuxONE, any version
7070

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

7474
[discrete]
7575
=== Hardware requirements
7676

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

8080
[NOTE]
8181
====
82-
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.
82+
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.
8383
====
8484

8585
[IMPORTANT]
@@ -140,7 +140,7 @@ Each cluster virtual machine must meet the following minimum requirements:
140140
--
141141

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

145145
[discrete]
146146
=== Hardware requirements

modules/minimum-ibm-z-system-requirements.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

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

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

12-
* IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
12+
* IBM z16 (all models), IBM z15 (all models), IBM z14 (all models), IBM z13, and IBM z13s
1313
* LinuxONE, any version
1414
1515
[discrete]
1616
== Hardware requirements
1717

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

2121
[NOTE]
2222
====
23-
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.
23+
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.
2424
====
2525

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

3636
On your z/VM instance, set up:
3737

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

4242
[discrete]
43-
== IBM Z network connectivity requirements
43+
== {ibmzProductName} network connectivity requirements
4444

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

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

0 commit comments

Comments
 (0)