Skip to content

Commit 18e1aa9

Browse files
mjpytlakmjpytlak
authored
Merge pull request #62676 from SNiemann15/osdocs6508
[OSDOCS 6508] Restructure install config parms to book level IBM Z
2 parents f7c0bdc + daa07da commit 18e1aa9

8 files changed

+78
-46
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ Topics:
378378
File: installing-ibm-z
379379
- Name: Restricted network IBM Z installation with z/VM
380380
File: installing-restricted-networks-ibm-z
381+
- Name: Installation configuration parameters for IBM Z and IBM LinuxONE with z/VM
382+
File: installation-config-parameters-ibm-z
381383
- Name: Installing with RHEL KVM on IBM Z and IBM LinuxONE
382384
Dir: installing_ibm_z
383385
Distros: openshift-enterprise
@@ -388,6 +390,8 @@ Topics:
388390
File: installing-ibm-z-kvm
389391
- Name: Restricted network IBM Z installation with RHEL KVM
390392
File: installing-restricted-networks-ibm-z-kvm
393+
- Name: Installation configuration parameters for IBM Z and IBM LinuxONE with RHEL KVM
394+
File: installation-config-parameters-ibm-z-kvm
391395
- Name: Installing on IBM Power
392396
Dir: installing_ibm_power
393397
Distros: openshift-enterprise

‎installing/installing_ibm_z/installation-config-parameters-ibm-z-kvm.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
:_content-type: ASSEMBLY
2+
[id="installation-config-parameters-ibm-z-kvm"]
3+
= Installation configuration parameters for IBM Z(R) and {linuxoneProductName} with {op-system-base} KVM
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-ibm-z-kvm
6+
:platform: IBM Z
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+
[NOTE]
13+
====
14+
While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}.
15+
====
16+
17+
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

‎installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
:_content-type: ASSEMBLY
2+
[id="installation-config-parameters-ibm-z"]
3+
= Installation configuration parameters for IBM Z(R) and {linuxoneProductName} with z/VM
4+
include::_attributes/common-attributes.adoc[]
5+
:context: installation-config-parameters-ibm-z
6+
:platform: IBM Z
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+
[NOTE]
13+
====
14+
While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}.
15+
====
16+
17+
include::modules/installation-configuration-parameters.adoc[leveloffset=+1]

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

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

@@ -71,7 +71,9 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
7171

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

74-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
74+
[role="_additional-resources"]
75+
.Additional resources
76+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z-kvm.adoc#installation-config-parameters-ibm-z-kvm[Installation configuration parameters for {ibmzProductName} with {op-system-base} KVM]
7577

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

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

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

@@ -86,7 +86,9 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1]
8686

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

89-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
89+
[role="_additional-resources"]
90+
.Additional resources
91+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName} with z/VM]
9092

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

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

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

@@ -78,7 +78,9 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
7878

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

81-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
81+
[role="_additional-resources"]
82+
.Additional resources
83+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z-kvm.adoc#installation-config-parameters-ibm-z-kvm[Installation configuration parameters for {ibmzProductName} with {op-system-base} KVM]
8284

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

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

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

@@ -92,7 +92,9 @@ include::modules/ssh-agent-using.adoc[leveloffset=+1]
9292

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

95-
include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
95+
[role="_additional-resources"]
96+
.Additional resources
97+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName} with z/VM]
9698

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

‎modules/installation-configuration-parameters.adoc

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
// * installing/installing_ibm_powervs/installing-ibm-power-vs-private-cluster.adoc
3232
// * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
3333
// * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
34-
// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
35-
// * installing/installing_ibm_z/installing-ibm-z.adoc
36-
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
37-
// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
3834
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
3935
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
4036
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
@@ -58,6 +54,8 @@
5854
// * installing/installing-restricted-networks-nutanix-installer-provisioned.adoc
5955
// * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
6056
// * installing/installing_gcp/installation-config-parameters-gcp.adoc
57+
// * installing/installing_gcp/installation-config-parameters-ibm-z.adoc
58+
// * installing/installing_gcp/installation-config-parameters-ibm-z-kvm.adoc
6159

6260
ifeval::["{context}" == "installing-alibaba-customizations"]
6361
:alibabacloud:
@@ -184,18 +182,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
184182
:osp:
185183
:osp-custom:
186184
endif::[]
187-
ifeval::["{context}" == "installing-ibm-z"]
188-
:ibm-z:
189-
endif::[]
190-
ifeval::["{context}" == "installing-ibm-z-kvm"]
191-
:ibm-z:
192-
endif::[]
193-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
194-
:ibm-z:
195-
endif::[]
196-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
197-
:ibm-z:
198-
endif::[]
199185
ifeval::["{context}" == "installing-ibm-power"]
200186
:ibm-power:
201187
endif::[]
@@ -232,20 +218,26 @@ endif::[]
232218
ifeval::["{context}" == "installation-config-parameters-gcp"]
233219
:gcp:
234220
endif::[]
221+
ifeval::["{context}" == "installation-config-parameters-ibm-z"]
222+
:ibm-z:
223+
endif::[]
224+
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
225+
:ibm-z:
226+
endif::[]
235227

236228

237229
:_content-type: CONCEPT
238230
[id="installation-configuration-parameters_{context}"]
239-
ifndef::vsphere,gcp[]
231+
ifndef::vsphere,gcp,ibm-z[]
240232
= Installation configuration parameters
241-
endif::vsphere,gcp[]
233+
endif::vsphere,gcp,ibm-z[]
242234

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

250242
// If install-config.yaml is generated by openshift-install
251243
// 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
@@ -256,31 +248,31 @@ Before you deploy an {product-title} cluster, you provide parameter values to de
256248
endif::bare,ibm-power,ibm-z,ash,vsphere,gcp[]
257249

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

263255
// A condition for this note is required as part of the effort for https://issues.redhat.com/browse/OSDOCS-6493.
264256
// This accommodates the existing content for installation assemblies, while the improvement is implemented.
265257
// As part of the updates for the last provider, this note can be removed from the module
266-
ifndef::vsphere,gcp[]
258+
ifndef::vsphere,gcp,ibm-z[]
267259
[NOTE]
268260
====
269261
After installation, you cannot modify these parameters in the `install-config.yaml` file.
270262
====
271-
endif::vsphere,gcp[]
263+
endif::vsphere,gcp,ibm-z[]
272264

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

279271
[NOTE]
280272
====
281273
After installation, you cannot modify these parameters in the `install-config.yaml` file.
282274
====
283-
endif::vsphere,gcp[]
275+
endif::vsphere,gcp,ibm-z[]
284276

285277
[id="installation-configuration-parameters-required_{context}"]
286278
== Required configuration parameters
@@ -2323,18 +2315,6 @@ ifeval::["{context}" == "installing-openstack-installer-restricted"]
23232315
:!osp:
23242316
:!osp-custom:
23252317
endif::[]
2326-
ifeval::["{context}" == "installing-ibm-z"]
2327-
:!ibm-z:
2328-
endif::[]
2329-
ifeval::["{context}" == "installing-ibm-z-kvm"]
2330-
:!ibm-z:
2331-
endif::[]
2332-
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
2333-
:!ibm-z:
2334-
endif::[]
2335-
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
2336-
:!ibm-z:
2337-
endif::[]
23382318
ifeval::["{context}" == "installing-ibm-power"]
23392319
:!ibm-power:
23402320
endif::[]
@@ -2371,4 +2351,10 @@ endif::[]
23712351
ifeval::["{context}" == "installation-config-parameters-gcp"]
23722352
:!gcp:
23732353
endif::[]
2354+
ifeval::["{context}" == "installation-config-parameters-ibm-z"]
2355+
:!ibm-z:
2356+
endif::[]
2357+
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
2358+
:!ibm-z:
2359+
endif::[]
23742360
:!platform:

0 commit comments

Comments
 (0)