Skip to content

Commit 4e26557

Browse files
authored
Merge pull request #70553 from alishaIBM/4.15-install-doc
OCP 4.15 Installation doc updates for IBM Power
2 parents aaf9a20 + cdaea8a commit 4e26557

5 files changed

+27
-13
lines changed

modules/installation-bare-metal-config-yaml.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,13 @@ endif::restricted[]
218218
----
219219
<1> The base domain of the cluster. All DNS records must be sub-domains of this base and include the cluster name.
220220
<2> The `controlPlane` section is a single mapping, but the `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Only one control plane pool is used.
221+
ifndef::ibm-power[]
221222
<3> Specifies whether to enable or disable simultaneous multithreading (SMT), or hyperthreading. By default, SMT is enabled to increase the performance of the cores in your machines. You can disable it by setting the parameter value to `Disabled`. If you disable SMT, you must disable it in all cluster machines; this includes both control plane and compute machines.
222-
ifndef::ibm-z,ibm-z-kvm[]
223+
endif::ibm-power[]
224+
ifdef::ibm-power[]
225+
<3> Simultaneous multithreading (SMT) is not supported.
226+
endif::ibm-power[]
227+
ifndef::ibm-z,ibm-z-kvm,ibm-power[]
223228
+
224229
[NOTE]
225230
====
@@ -230,7 +235,7 @@ Simultaneous multithreading (SMT) is enabled by default. If SMT is not enabled i
230235
====
231236
If you disable `hyperthreading`, whether in the BIOS or in the `install-config.yaml` file, ensure that your capacity planning accounts for the dramatically decreased machine performance.
232237
====
233-
endif::ibm-z,ibm-z-kvm[]
238+
endif::ibm-z,ibm-z-kvm,ibm-power[]
234239
ifdef::ibm-z,ibm-z-kvm[]
235240
+
236241
[NOTE]

modules/installation-load-balancing-user-infra.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,31 +181,31 @@ listen api-server-6443 <1>
181181
bind *:6443
182182
mode tcp
183183
server bootstrap bootstrap.ocp4.example.com:6443 check inter 1s backup <2>
184-
server master0 master0.ocp4.example.com:6443 check inter 1s
185-
server master1 master1.ocp4.example.com:6443 check inter 1s
186-
server master2 master2.ocp4.example.com:6443 check inter 1s
184+
server control-plane0 control-plane0.ocp4.example.com:6443 check inter 1s
185+
server control-plane1 control-plane1.ocp4.example.com:6443 check inter 1s
186+
server control-plane2 control-plane2.ocp4.example.com:6443 check inter 1s
187187
listen machine-config-server-22623 <3>
188188
bind *:22623
189189
mode tcp
190190
option httpchk GET /readyz HTTP/1.0
191191
option log-health-checks
192192
balance roundrobin
193193
server bootstrap bootstrap.ocp4.example.com:6443 verify none check check-ssl inter 10s fall 2 rise 3 backup <2>
194-
server master0 master0.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
195-
server master1 master1.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
196-
server master2 master2.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
194+
server control-plane0 control-plane0.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
195+
server control-plane1 control-plane1.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
196+
server control-plane2 control-plane2.ocp4.example.com:6443 weight 1 verify none check check-ssl inter 10s fall 2 rise 3
197197
listen ingress-router-443 <4>
198198
bind *:443
199199
mode tcp
200200
balance source
201-
server worker0 worker0.ocp4.example.com:443 check inter 1s
202-
server worker1 worker1.ocp4.example.com:443 check inter 1s
201+
server compute0 compute0.ocp4.example.com:443 check inter 1s
202+
server compute1 compute1.ocp4.example.com:443 check inter 1s
203203
listen ingress-router-80 <5>
204204
bind *:80
205205
mode tcp
206206
balance source
207-
server worker0 worker0.ocp4.example.com:80 check inter 1s
208-
server worker1 worker1.ocp4.example.com:80 check inter 1s
207+
server compute0 compute0.ocp4.example.com:80 check inter 1s
208+
server compute1 compute1.ocp4.example.com:80 check inter 1s
209209
----
210210

211211
<1> Port `6443` handles the Kubernetes API traffic and points to the control plane machines.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,12 @@ Optional: You can bond multiple SR-IOV network interfaces to a dual port NIC int
293293

294294
On each node, you must perform the following tasks:
295295

296+
ifndef::installing-ibm-power[]
296297
. Create the SR-IOV virtual functions (VFs) following the guidance in link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/configuring_and_managing_virtualization/managing-virtual-devices_configuring-and-managing-virtualization#managing-sr-iov-devices_managing-virtual-devices[Managing SR-IOV devices]. Follow the procedure in the "Attaching SR-IOV networking devices to virtual machines" section.
298+
endif::installing-ibm-power[]
299+
ifdef::installing-ibm-power[]
300+
. Create the SR-IOV virtual functions (VFs).
301+
endif::installing-ibm-power[]
297302

298303
. Create the bond, attach the desired VFs to the bond and set the bond link state up following the guidance in link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/configuring_and_managing_networking/configuring-network-bonding_configuring-and-managing-networking[Configuring network bonding]. Follow any of the described procedures to create the bond.
299304

modules/nw-operator-cr.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,10 @@ defaultNetwork:
347347
genevePort: 6081
348348
ipsecConfig: {}
349349
----
350+
[IMPORTANT]
351+
====
352+
Using OVNKubernetes can lead to a stack exhaustion problem on {ibm-power-name}.
353+
====
350354

351355
[discrete]
352356
[id="nw-operator-cr-kubeproxyconfig_{context}"]

modules/recommended-ibm-power-system-requirements.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ On your {ibm-power-name} instance, set up:
3232
== Network for the PowerVM guest virtual machines
3333

3434
* Dedicated physical adapter, or SR-IOV virtual function
35-
* Available by the Virtual I/O Server using Shared Ethernet Adapter
35+
* Virtualized by the Virtual I/O Server using Shared Ethernet Adapter
3636
* Virtualized by the Virtual I/O Server using {ibm-name} vNIC
3737

3838
[discrete]

0 commit comments

Comments
 (0)