Skip to content

Commit b4b4e43

Browse files
author
mikemckiernan
authored
Merge pull request #35549 from ktania46/p
[BZ 1993785]: Add ovn and networking sections to IBM Power
2 parents 45b9739 + e79dc39 commit b4b4e43

File tree

4 files changed

+44
-8
lines changed

4 files changed

+44
-8
lines changed

installing/installing_ibm_power/installing-ibm-power.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,16 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
5454

5555
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
5656

57+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
58+
5759
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
5860

5961
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
6062

6163
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
6264

65+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
66+
6367
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
6468

6569
[id="creating-machines-bare-metal-power"]

installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,16 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
6262

6363
include::modules/installation-initializing-manual.adoc[leveloffset=+1]
6464

65+
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
66+
6567
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
6668

6769
include::modules/installation-configure-proxy.adoc[leveloffset=+2]
6870

6971
include::modules/installation-three-node-cluster.adoc[leveloffset=+2]
7072

73+
include::modules/nw-operator-cr.adoc[leveloffset=+1]
74+
7175
include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[leveloffset=+1]
7276

7377
[id="creating-machines-ibm-power-restricted-network"]

modules/installation-configuration-parameters.adoc

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
3333
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
3434
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
35+
// * installing/installing_ibm_power/installing-ibm-power.adoc
36+
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
3537

3638
ifeval::["{context}" == "installing-aws-customizations"]
3739
:aws:
@@ -157,18 +159,24 @@ endif::[]
157159
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
158160
:ibm-z:
159161
endif::[]
162+
ifeval::["{context}" == "installing-ibm-power"]
163+
:ibm-power:
164+
endif::[]
165+
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
166+
:ibm-power:
167+
endif::[]
160168

161169
[id="installation-configuration-parameters_{context}"]
162170
= Installation configuration parameters
163171

164172
// If install-config.yaml is generated by openshift-install
165-
ifndef::bare,ibm-z[]
173+
ifndef::bare,ibm-power,ibm-z[]
166174
Before you deploy an {product-title} cluster, you provide parameter values to describe your account on the cloud platform that hosts your cluster and optionally customize your cluster's platform. When you create the `install-config.yaml` installation configuration file, you provide values for the required parameters through the command line. If you customize your cluster, you can modify the `install-config.yaml` file to provide more details about the platform.
167-
endif::bare,ibm-z[]
175+
endif::bare,ibm-power,ibm-z[]
168176
// If the user manually creates install-config.yaml
169-
ifdef::bare,ibm-z[]
177+
ifdef::bare,ibm-power,ibm-z[]
170178
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
171-
endif::bare,ibm-z[]
179+
endif::bare,ibm-power,ibm-z[]
172180

173181
[NOTE]
174182
====
@@ -426,18 +434,24 @@ Optional installation configuration parameters are described in the following ta
426434
|The configuration for the machines that comprise the compute nodes.
427435
|Array of `MachinePool` objects. For details, see the following "Machine-pool" table.
428436

429-
ifndef::ibm-z[]
437+
ifndef::ibm-z,ibm-power[]
430438
|`compute.architecture`
431439
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `amd64` (the default).
432440
|String
433-
endif::ibm-z[]
441+
endif::ibm-z,ibm-power[]
434442

435443
ifdef::ibm-z[]
436444
|`compute.architecture`
437445
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `s390x` (the default).
438446
|String
439447
endif::ibm-z[]
440448

449+
ifdef::ibm-power[]
450+
|`compute.architecture`
451+
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `ppc64le` (the default).
452+
|String
453+
endif::ibm-power[]
454+
441455
|`compute.hyperthreading`
442456
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on compute machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
443457
[IMPORTANT]
@@ -463,18 +477,24 @@ accounts for the dramatically decreased machine performance.
463477
|The configuration for the machines that comprise the control plane.
464478
|Array of `MachinePool` objects. For details, see the following "Machine-pool" table.
465479

466-
ifndef::ibm-z[]
480+
ifndef::ibm-z,ibm-power[]
467481
|`controlPlane.architecture`
468482
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `amd64` (the default).
469483
|String
470-
endif::ibm-z[]
484+
endif::ibm-z,ibm-power[]
471485

472486
ifdef::ibm-z[]
473487
|`controlPlane.architecture`
474488
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `s390x` (the default).
475489
|String
476490
endif::ibm-z[]
477491

492+
ifdef::ibm-power[]
493+
|`controlPlane.architecture`
494+
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `ppc64le` (the default).
495+
|String
496+
endif::ibm-power[]
497+
478498
|`controlPlane.hyperthreading`
479499
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on control plane machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
480500
[IMPORTANT]
@@ -1307,3 +1327,9 @@ endif::[]
13071327
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
13081328
:!ibm-z:
13091329
endif::[]
1330+
ifeval::["{context}" == "installing-ibm-power"]
1331+
:!ibm-power:
1332+
endif::[]
1333+
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
1334+
:!ibm-power:
1335+
endif::[]

modules/nw-operator-cr.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
1515
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
1616
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
17+
// * installing/installing_ibm_power/installing-ibm-power.adoc
18+
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
1719

1820
// Installation assemblies need different details than the CNO operator does
1921
ifeval::["{context}" == "cluster-network-operator"]

0 commit comments

Comments
 (0)