Skip to content

Commit b5172e8

Browse files
authored
Merge pull request #63517 from SNiemann15/osdocs7424
[OSDOCS 7424] Restructure IBM Power config parms to book level
2 parents 81bba70 + 4bfc885 commit b5172e8

File tree

5 files changed

+44
-33
lines changed

5 files changed

+44
-33
lines changed

_topic_maps/_topic_map.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,8 @@ Topics:
402402
File: installing-ibm-power
403403
- Name: Restricted network IBM Power installation
404404
File: installing-restricted-networks-ibm-power
405+
- Name: Installation configuration parameters for IBM Power
406+
File: installation-config-parameters-ibm-power
405407
- Name: Installing on IBM Power Virtual Server
406408
Dir: installing_ibm_powervs
407409
Distros: openshift-enterprise
@@ -3782,7 +3784,7 @@ Topics:
37823784
- Name: Using DPDK with SR-IOV
37833785
File: virt-using-dpdk-with-sriov
37843786
- Name: Hot plugging secondary network interfaces
3785-
File: virt-hot-plugging-network-interfaces
3787+
File: virt-hot-plugging-network-interfaces
37863788
- Name: Connecting a VM to a service mesh
37873789
File: virt-connecting-vm-to-service-mesh
37883790
- Name: Configuring a dedicated network for live migration
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:_content-type: ASSEMBLY
2+
[id="installation-config-parameters-ibm-power"]
3+
= Installation configuration parameters for {ibmpowerProductName}
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-ibm-power
6+
:platform: IBM Power
7+
8+
toc::[]
9+
10+
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
11+
12+
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

installing/installing_ibm_power/installing-ibm-power.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
:_content-type: ASSEMBLY
22
[id="installing-ibm-power"]
3-
= Installing a cluster on IBM Power
3+
= Installing a cluster on {ibmpowerProductName}
44
include::_attributes/common-attributes.adoc[]
55
:context: installing-ibm-power
66

77
toc::[]
88

99
In {product-title} version {product-version}, you can install a cluster on
10-
IBM Power infrastructure that you provision.
10+
{ibmpowerProductName} infrastructure that you provision.
1111

1212
[IMPORTANT]
1313
====
@@ -67,7 +67,9 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
6767

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

70-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
70+
[role="_additional-resources"]
71+
.Additional resources
72+
* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibmpowerProductName}]
7173

7274
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
7375

@@ -82,7 +84,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
8284
[id="creating-machines-bare-metal-power"]
8385
== Installing {op-system} and starting the {product-title} bootstrap process
8486

85-
To install {product-title} on IBM Power infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
87+
To install {product-title} on {ibmpowerProductName} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
8688

8789
Follow either the steps to use an ISO image or network PXE booting to install {op-system} on the machines.
8890

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

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

77
toc::[]
88

99
In {product-title} version {product-version}, you can install a cluster on
10-
IBM Power infrastructure that you provision in a restricted network.
10+
{ibmpowerProductName} infrastructure that you provision in a restricted network.
1111

1212
[IMPORTANT]
1313
====
@@ -75,7 +75,9 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
7575

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

78-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
78+
[role="_additional-resources"]
79+
.Additional resources
80+
* xref:../../installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc#installation-config-parameters-ibm-power[Installation configuration parameters for {ibmpowerProductName}]
7981

8082
include::modules/installation-bare-metal-config-yaml.adoc[leveloffset=+2]
8183

@@ -90,7 +92,7 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
9092
[id="creating-machines-ibm-power-restricted-network"]
9193
== Installing {op-system} and starting the {product-title} bootstrap process
9294

93-
To install {product-title} on IBM Power infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
95+
To install {product-title} on {ibmpowerProductName} infrastructure that you provision, you must install {op-system-first} on the machines. When you install {op-system}, you must provide the Ignition config file that was generated by the {product-title} installation program for the type of machine you are installing. If you have configured suitable networking, DNS, and load balancing infrastructure, the {product-title} bootstrap process begins automatically after the {op-system} machines have rebooted.
9496

9597
Follow either the steps to use an ISO image or network PXE booting to install {op-system} on the machines.
9698

modules/installation-configuration-parameters.adoc

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
// * installing/installing_ibm_cloud_public/installing-ibm-cloud-network-customizations.adoc
2626
// * installing/installing_ibm_cloud_public/installing-ibm-cloud-vpc.adoc
2727
// * installing/installing_ibm_cloud_public/intalling-ibm-cloud-private.adoc
28-
// * installing/installing_ibm_power/installing-ibm-power.adoc
29-
// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
3028
// * installing/installing_ibm_powervs/installing-ibm-power-vs-customizations.adoc
3129
// * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
3230
// * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
@@ -56,6 +54,7 @@
5654
// * installing/installing_gcp/installation-config-parameters-gcp.adoc
5755
// * installing/installing_gcp/installation-config-parameters-ibm-z.adoc
5856
// * installing/installing_gcp/installation-config-parameters-ibm-z-kvm.adoc
57+
// * installing/installing_gcp/installation-config-parameters-ibm-power.adoc
5958

6059
ifeval::["{context}" == "installing-alibaba-customizations"]
6160
:alibabacloud:
@@ -182,12 +181,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
182181
:osp:
183182
:osp-custom:
184183
endif::[]
185-
ifeval::["{context}" == "installing-ibm-power"]
186-
:ibm-power:
187-
endif::[]
188-
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
189-
:ibm-power:
190-
endif::[]
191184
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
192185
:ibm-power-vs:
193186
endif::[]
@@ -224,20 +217,23 @@ endif::[]
224217
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
225218
:ibm-z:
226219
endif::[]
220+
ifeval::["{context}" == "installation-config-parameters-ibm-power"]
221+
:ibm-power:
222+
endif::[]
227223

228224

229225
:_content-type: CONCEPT
230226
[id="installation-configuration-parameters_{context}"]
231-
ifndef::vsphere,gcp,ibm-z[]
227+
ifndef::vsphere,gcp,ibm-z,ibm-power[]
232228
= Installation configuration parameters
233-
endif::vsphere,gcp,ibm-z[]
229+
endif::vsphere,gcp,ibm-z,ibm-power[]
234230

235231
// Managing headings is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
236232
// This accommodates the existing IA of the installation assemblies, while the improvement is implemented.
237233
// As part of the updates for the last provider, the conditions can be removed and the following heading can be used.
238-
ifdef::vsphere,gcp,ibm-z[]
234+
ifdef::vsphere,gcp,ibm-z,ibm-power[]
239235
= Available installation configuration parameters for {platform}
240-
endif::vsphere,gcp,ibm-z[]
236+
endif::vsphere,gcp,ibm-z,ibm-power[]
241237

242238
// If install-config.yaml is generated by openshift-install
243239
// The addition of providers beyond bare,ibm-power,ibm-z,ash is necessary as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493
@@ -248,31 +244,31 @@ Before you deploy an {product-title} cluster, you provide parameter values to de
248244
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp[]
249245

250246
// If the user manually creates install-config.yaml
251-
ifdef::bare,ibm-power,ibm-power-vs,ash[]
247+
ifdef::bare,ibm-power-vs,ash[]
252248
Before you deploy an {product-title} cluster, you provide a customized `install-config.yaml` installation configuration file that describes the details for your environment.
253-
endif::bare,ibm-power,ibm-power-vs,ash[]
249+
endif::bare,ibm-power-vs,ash[]
254250

255251
// A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
256252
// This accommodates the existing content for installation assemblies, while the improvement is implemented.
257253
// As part of the updates for the last provider, this note can be removed from the module
258-
ifndef::vsphere,gcp,ibm-z[]
254+
ifndef::vsphere,gcp,ibm-z,ibm-power[]
259255
[NOTE]
260256
====
261257
After installation, you cannot modify these parameters in the `install-config.yaml` file.
262258
====
263-
endif::vsphere,gcp,ibm-z[]
259+
endif::vsphere,gcp,ibm-z,ibm-power[]
264260

265261
// This condition is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
266262
// As part of the update for each provider, this content applies to the net new provider-specific installation configuration parameter assembly.
267263
// As part of the updates for the last provider, the conditions can be completely removed.
268-
ifdef::vsphere,gcp,ibm-z[]
264+
ifdef::vsphere,gcp,ibm-z,ibm-power[]
269265
The following tables specify the required, optional, and {platform}-specific installation configuration parameters that you can set as part of the installation process.
270266

271267
[NOTE]
272268
====
273269
After installation, you cannot modify these parameters in the `install-config.yaml` file.
274270
====
275-
endif::vsphere,gcp,ibm-z[]
271+
endif::vsphere,gcp,ibm-z,ibm-power[]
276272

277273
[id="installation-configuration-parameters-required_{context}"]
278274
== Required configuration parameters
@@ -2233,12 +2229,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
22332229
:!osp:
22342230
:!osp-custom:
22352231
endif::[]
2236-
ifeval::["{context}" == "installing-ibm-power"]
2237-
:!ibm-power:
2238-
endif::[]
2239-
ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
2240-
:!ibm-power:
2241-
endif::[]
22422232
ifeval::["{context}" == "installing-ibm-power-vs-customizations"]
22432233
:!ibm-power-vs:
22442234
endif::[]
@@ -2275,4 +2265,7 @@ endif::[]
22752265
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
22762266
:!ibm-z:
22772267
endif::[]
2268+
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
2269+
:!ibm-power:
2270+
endif::[]
22782271
:!platform:

0 commit comments

Comments
 (0)