Skip to content

Commit 6d341a9

Browse files
bergerhofferbergerhoffer
authored
Merge pull request #47342 from SNiemann15/ibmz_install
[MULTIARCH-2479] IBM Z installation changes for 4.11
2 parents 04103f0 + 59d0e9d commit 6d341a9

9 files changed

+32
-22
lines changed

‎installing/installing_ibm_z/installing-ibm-z-kvm.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
:_content-type: ASSEMBLY
22
[id="installing-ibm-z-kvm"]
3-
= Installing a cluster with {op-system-base} KVM on IBM Z and LinuxONE
3+
= Installing a cluster with {op-system-base} KVM on {ibmzProductName} and LinuxONE
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-ibm-z-kvm
66

77
toc::[]
88

99
[role="_abstract"]
1010
In {product-title} version {product-version}, you can install a cluster on
11-
IBM Z or LinuxONE infrastructure that you provision.
11+
{ibmzProductName} or LinuxONE infrastructure that you provision.
1212

1313
[NOTE]
1414
====
15-
While this document refers only to IBM Z, all information in it also applies to LinuxONE.
15+
While this document refers only to {ibmzProductName}, all information in it also applies to LinuxONE.
1616
====
1717

1818
[IMPORTANT]
@@ -28,12 +28,13 @@ link:https://access.redhat.com/articles/4207611[guidelines for deploying {produc
2828
* Before you begin the installation process, you must clean the installation directory. This ensures that the required installation files are created and updated during the installation process.
2929
* You provisioned xref:../../storage/persistent_storage/persistent-storage-ocs.adoc#persistent-storage-ocs[persistent storage using {rh-storage}] or other supported storage protocols for your cluster. To deploy a private image registry, you must set up persistent storage with `ReadWriteMany` access.
3030
* If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
31-
* You provisioned a {op-system-base} Kernel Virtual Machine (KVM) system that is hosted on the logical partition (LPAR) and based on {op-system-base} 8.4 or later.
3231
+
3332
[NOTE]
3433
====
3534
Be sure to also review this site list if you are configuring a proxy.
3635
====
36+
* You provisioned a {op-system-base} Kernel Virtual Machine (KVM) system that is hosted on the logical partition (LPAR) and based on {op-system-base} 8.4 or later. See link:https://access.redhat.com/support/policy/updates/errata#RHEL8_and_9_Life_Cycle[Red Hat Enterprise Linux 8 and 9 Life Cycle].
37+
3738

3839
include::modules/cluster-entitlements.adoc[leveloffset=+1]
3940

@@ -44,7 +45,7 @@ include::modules/csr-management.adoc[leveloffset=+2]
4445
[id="additional-resources_ibmz-kvm-recommended-host-practices"]
4546
.Additional resources
4647

47-
* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments]
48+
* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & LinuxONE environments]
4849

4950
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
5051

‎installing/installing_ibm_z/installing-ibm-z.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
:_content-type: ASSEMBLY
22
[id="installing-ibm-z"]
3-
= Installing a cluster with z/VM on IBM Z and LinuxONE
3+
= Installing a cluster with z/VM on {ibmzProductName} and LinuxONE
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-ibm-z
66

77
toc::[]
88

99
[role="_abstract"]
1010
In {product-title} version {product-version}, you can install a cluster on
11-
IBM Z or LinuxONE infrastructure that you provision.
11+
{ibmzProductName} or LinuxONE infrastructure that you provision.
1212

1313
[NOTE]
1414
====
15-
While this document refers only to IBM Z, all information in it also applies to LinuxONE.
15+
While this document refers only to {ibmzProductName}, all information in it also applies to LinuxONE.
1616
====
1717

1818
[IMPORTANT]

‎installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
:_content-type: ASSEMBLY
22
[id="installing-restricted-networks-ibm-z-kvm"]
3-
= Installing a cluster with {op-system-base} KVM on IBM Z and LinuxONE in a restricted network
3+
= Installing a cluster with {op-system-base} KVM on {ibmzProductName} and LinuxONE in a restricted network
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-restricted-networks-ibm-z-kvm
66

77
toc::[]
88

99
[role="_abstract"]
1010
In {product-title} version {product-version}, you can install a cluster on
11-
IBM Z and LinuxONE infrastructure that you provision in a restricted network.
11+
{ibmzProductName} and LinuxONE infrastructure that you provision in a restricted network.
1212

1313
[NOTE]
1414
====
15-
While this document refers to only IBM Z, all information in it also applies to LinuxONE.
15+
While this document refers to only {ibmzProductName}, all information in it also applies to LinuxONE.
1616
====
1717

1818
[IMPORTANT]
@@ -34,12 +34,12 @@ Ensure that installation steps are done from a machine with access to the instal
3434
====
3535
* You provisioned xref:../../storage/persistent_storage/persistent-storage-ocs.adoc#persistent-storage-ocs[persistent storage using {rh-storage}] or other supported storage protocols for your cluster. To deploy a private image registry, you must set up persistent storage with `ReadWriteMany` access.
3636
* If you use a firewall, you xref:../../installing/install_config/configuring-firewall.adoc#configuring-firewall[configured it to allow the sites] that your cluster requires access to.
37-
* You provisioned a {op-system-base} Kernel Virtual Machine (KVM) system that is hosted on the logical partition (LPAR) and based on {op-system-base} 8.4 or later.
3837
+
3938
[NOTE]
4039
====
4140
Be sure to also review this site list if you are configuring a proxy.
4241
====
42+
* You provisioned a {op-system-base} Kernel Virtual Machine (KVM) system that is hosted on the logical partition (LPAR) and based on {op-system-base} 8.4 or later. See link:https://access.redhat.com/support/policy/updates/errata#RHEL8_and_9_Life_Cycle[Red Hat Enterprise Linux 8 and 9 Life Cycle].
4343

4444
include::modules/installation-about-restricted-network.adoc[leveloffset=+1]
4545

‎installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
:_content-type: ASSEMBLY
22
[id="installing-restricted-networks-ibm-z"]
3-
= Installing a cluster with z/VM on IBM Z and LinuxONE in a restricted network
3+
= Installing a cluster with z/VM on {ibmzProductName} and LinuxONE in a restricted network
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-restricted-networks-ibm-z
66

77
toc::[]
88

99
[role="_abstract"]
1010
In {product-title} version {product-version}, you can install a cluster on
11-
IBM Z and LinuxONE infrastructure that you provision in a restricted network.
11+
{ibmzProductName} and LinuxONE infrastructure that you provision in a restricted network.
1212

1313
[NOTE]
1414
====
15-
While this document refers to only IBM Z, all information in it also applies to LinuxONE.
15+
While this document refers to only {ibmzProductName}, all information in it also applies to LinuxONE.
1616
====
1717

1818
[IMPORTANT]
@@ -67,7 +67,7 @@ include::modules/csr-management.adoc[leveloffset=+2]
6767

6868
* See link:https://www.vm.ibm.com/library/presentations/lparperf.pdf[Topics in LPAR performance] for LPAR weight management and entitlements.
6969

70-
* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments]
70+
* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibmzProductName} & LinuxONE environments]
7171

7272
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
7373

‎modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Complete the following steps to create the machines in a full installation on a
1111

1212
.Prerequisites
1313

14-
* At least one LPAR running {op-system-base} 8.4 with KVM, referred to as {op-system-base} KVM host in this procedure.
14+
* At least one LPAR running on {op-system-base} 8.4 or later with KVM, referred to as {op-system-base} KVM host in this procedure.
1515
* The KVM/QEMU hypervisor is installed on the {op-system-base} KVM host.
1616
* A domain name server (DNS) that can perform hostname and reverse lookup for the nodes.
1717
* An HTTP or HTTPS server is set up.

‎modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Complete the following steps to create the machines in a fast-track installation
1111

1212
.Prerequisites
1313

14-
* At least one LPAR running {op-system-base} 8.4 with KVM, referred to as {op-system-base} KVM host in this procedure.
14+
* At least one LPAR running on {op-system-base} 8.4 or later with KVM, referred to as {op-system-base} KVM host in this procedure.
1515
* The KVM/QEMU hypervisor is installed on the {op-system-base} KVM host.
1616
* A domain name server (DNS) that can perform hostname and reverse lookup for the nodes.
1717
* A DHCP server that provides IP addresses.

‎modules/installation-installing-bare-metal.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ INFO It is now safe to remove the bootstrap resources
6767
The command succeeds when the Kubernetes API server signals that it has been
6868
bootstrapped on the control plane machines.
6969

70-
. After bootstrap process is complete, remove the bootstrap machine from the
70+
. After the bootstrap process is complete, remove the bootstrap machine from the
7171
load balancer.
7272
+
7373
[IMPORTANT]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Since the overall performance of the cluster can be impacted, the LPARs that are
8989

9090
[discrete]
9191
=== Operating system requirements
92-
* One LPAR running {op-system-base} 8.4 or later with KVM, which is managed by libvirt
92+
* One LPAR running on {op-system-base} 8.4 or later with KVM, which is managed by libvirt
9393

9494
On your {op-system-base} KVM host, set up:
9595

@@ -151,7 +151,7 @@ Each cluster virtual machine must meet the following minimum requirements:
151151
[discrete]
152152
=== Operating system requirements
153153

154-
* For high availability, two or three LPARs running {op-system-base} 8.4 or later with KVM, which are managed by libvirt.
154+
* For high availability, two or three LPARs running on {op-system-base} 8.4 or later with KVM, which are managed by libvirt.
155155

156156
On your {op-system-base} KVM host, set up:
157157

‎modules/installation-user-infra-machines-static-network.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,20 @@ ip=bond0:dhcp
200200

201201
To configure the bonded interface to use a static IP address,
202202
enter the specific IP address you want and related information. For example:
203-
203+
ifndef::ibm-z[]
204204
----
205205
bond=bond0:em1,em2:mode=active-backup
206206
ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:bond0:none
207207
----
208+
endif::ibm-z[]
209+
ifdef::ibm-z[]
210+
----
211+
bond=bond0:em1,em2:mode=active-backup,fail_over_mac=1
212+
ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:bond0:none
213+
----
214+
215+
Always set option `fail_over_mac=1` in active-backup mode, to avoid problems when shared OSA/RoCE cards are used.
216+
endif::ibm-z[]
208217

209218
a|Optional: You can configure VLANs on bonded interfaces by using the `vlan=` parameter.
210219
a|

0 commit comments

Comments
 (0)