Skip to content

Commit 3345a11

Browse files
Merge pull request #64691 from SNiemann15/ibmz_restructure_toc
[OSDOCS 7108] Restructure IBM Z toc to one entry point
2 parents 0eebb4c + 6128af1 commit 3345a11

10 files changed

+44
-67
lines changed

_topic_maps/_topic_map.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -377,30 +377,22 @@ Topics:
377377
File: install-ibm-cloud-prerequisites
378378
- Name: Installation workflow
379379
File: install-ibm-cloud-installation-workflow
380-
- Name: Installing with z/VM on IBM Z and IBM LinuxONE
380+
- Name: Installing on IBM Z and IBM LinuxONE
381381
Dir: installing_ibm_z
382382
Distros: openshift-enterprise
383383
Topics:
384-
- Name: Preparing to install with z/VM on IBM Z and IBM LinuxONE
384+
- Name: Preparing to install on IBM Z and IBM LinuxONE
385385
File: preparing-to-install-on-ibm-z
386386
- Name: Installing a cluster with z/VM on IBM Z and IBM LinuxONE
387387
File: installing-ibm-z
388388
- Name: Restricted network IBM Z installation with z/VM
389389
File: installing-restricted-networks-ibm-z
390-
- Name: Installation configuration parameters for IBM Z and IBM LinuxONE with z/VM
391-
File: installation-config-parameters-ibm-z
392-
- Name: Installing with RHEL KVM on IBM Z and IBM LinuxONE
393-
Dir: installing_ibm_z
394-
Distros: openshift-enterprise
395-
Topics:
396-
- Name: Preparing to install with RHEL KVM on IBM Z and IBM LinuxONE
397-
File: preparing-to-install-on-ibm-z-kvm
398390
- Name: Installing a cluster with RHEL KVM on IBM Z and IBM LinuxONE
399391
File: installing-ibm-z-kvm
400392
- Name: Restricted network IBM Z installation with RHEL KVM
401393
File: installing-restricted-networks-ibm-z-kvm
402-
- Name: Installation configuration parameters for IBM Z and IBM LinuxONE with RHEL KVM
403-
File: installation-config-parameters-ibm-z-kvm
394+
- Name: Installation configuration parameters for IBM Z and IBM LinuxONE
395+
File: installation-config-parameters-ibm-z
404396
- Name: Installing on IBM Power
405397
Dir: installing_ibm_power
406398
Distros: openshift-enterprise

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_content-type: ASSEMBLY
22
[id="installation-config-parameters-ibm-z"]
3-
= Installation configuration parameters for IBM Z(R) and {linuxoneProductName} with z/VM
3+
= Installation configuration parameters for IBM Z(R) and {linuxoneProductName}
44
include::_attributes/common-attributes.adoc[]
55
:context: installation-config-parameters-ibm-z
66
:platform: IBM Z

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
7373

7474
[role="_additional-resources"]
7575
.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]
76+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}]
7777

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

installing/installing_ibm_z/installing-ibm-z.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
9494

9595
[role="_additional-resources"]
9696
.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]
97+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}]
9898

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
8080

8181
[role="_additional-resources"]
8282
.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]
83+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}]
8484

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ include::modules/installation-initializing-manual.adoc[leveloffset=+1]
100100

101101
[role="_additional-resources"]
102102
.Additional resources
103-
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName} with z/VM]
103+
* xref:../../installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc#installation-config-parameters-ibm-z[Installation configuration parameters for {ibmzProductName}]
104104

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

installing/installing_ibm_z/preparing-to-install-on-ibm-z-kvm.adoc

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_content-type: ASSEMBLY
22
[id="preparing-to-install-on-ibm-z"]
3-
= Preparing to install with z/VM on {ibmzProductName} and {linuxoneProductName}
3+
= Preparing to install on IBM Z(R) and {linuxoneProductName}
44
include::_attributes/common-attributes.adoc[]
55
:context: preparing-to-install-on-ibm-z
66

@@ -11,12 +11,43 @@ toc::[]
1111

1212
* You reviewed details about the xref:../../architecture/architecture-installation.adoc#architecture-installation[{product-title} installation and update] processes.
1313
* You read the documentation on xref:../../installing/installing-preparing.adoc#installing-preparing[selecting a cluster installation method and preparing it for users].
14+
* 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.
15+
* 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.
16+
* 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.
17+
18+
[NOTE]
19+
====
20+
While this document refers only to {ibmzProductName}, all information in it also applies to {linuxoneProductName}.
21+
====
1422

1523
[id="choosing-an-method-to-install-ocp-on-ibm-z"]
16-
== Choosing a method to install {product-title} with z/VM on {ibmzProductName} or {linuxoneProductName}
24+
== Choosing a method to install {product-title} on {ibmzProductName} or {linuxoneProductName}
25+
26+
You can install {product-title} with the link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform/2022/html-single/assisted_installer_for_openshift_container_platform/index[{ai-full}]. This method requires no setup for the installer, and is ideal for connected environments like {ibmzProductName}.
27+
See xref:../../installing/installing_on_prem_assisted/installing-on-prem-assisted.adoc#installing-on-prem-assisted[Installing an on-premise cluster using the {ai-full}] for additional details.
28+
29+
[NOTE]
30+
====
31+
Installing OpenShift Container Platform with the Assisted Installer on {ibmzProductName} is supported only with {op-system-base} KVM installations.
32+
====
33+
34+
You can also install {product-title} on infrastructure that you provide. If you do not use infrastructure that the installation program provisions, you must manage and maintain the cluster resources yourself.
35+
36+
See the xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process] for more information about Assisted Installer and user-provisioned installation processes.
1737

18-
You can install a cluster with z/VM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision, by using one of the following methods:
38+
[IMPORTANT]
39+
====
40+
The steps for performing a user-provisioned infrastructure installation are provided as an example only. Installing a cluster with infrastructure you provide requires knowledge of the {ibmzProductName} platform and the installation process of {product-title}. Use the user-provisioned infrastructure installation instructions as a guide; you are free to create the required resources through other methods.
41+
====
42+
43+
=== User-provisioned infrastructure installation of {product-title} on {ibmzProductName}
44+
45+
User-provisioned infrastructure requires the user to provision all resources required by {product-title}.
1946

2047
* **xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName}]**: You can install {product-title} with z/VM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision.
2148

2249
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibmzProductName} and {linuxoneProductName} in a restricted network]**: You can install {product-title} with z/VM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted or disconnected network, by using an internal mirror of the installation release content. You can use this method to install a cluster that does not require an active internet connection to obtain the software components. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content.
50+
51+
* **xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with RHEL KVM on {ibmzProductName} and {linuxoneProductName}]**: You can install {product-title} with KVM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision.
52+
53+
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc#installing-restricted-networks-ibm-z-kvm[Installing a cluster with {op-system-base} KVM on {ibmzProductName} and {linuxoneProductName} in a restricted network]**: You can install {product-title} with {op-system-base} KVM on {ibmzProductName} or {linuxoneProductName} infrastructure that you provision in a restricted or disconnected network, by using an internal mirror of the installation release content. You can use this method to install a cluster that does not require an active internet connection to obtain the software components. You can also use this installation method to ensure that your clusters only use container images that satisfy your organizational controls on external content.

modules/installation-configuration-parameters.adoc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
// * installing/installing_vsphere/installation-config-parameters-vsphere.adoc
1818
// * installing/installing_gcp/installation-config-parameters-gcp.adoc
1919
// * installing/installing_ibm_z/installation-config-parameters-ibm-z.adoc
20-
// * installing/installing_ibm_z/installation-config-parameters-ibm-z-kvm.adoc
2120
// * installing/installing_ibm_power/installation-config-parameters-ibm-power.adoc
2221
// * installing/installing_azure_stack_hub/installation-config-parameters-ash.adoc
2322
// * installing/installing_bare_metal/installation-config-parameters-bare-metal.adoc
@@ -80,9 +79,6 @@ endif::[]
8079
ifeval::["{context}" == "installation-config-parameters-ibm-z"]
8180
:ibm-z:
8281
endif::[]
83-
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
84-
:ibm-z:
85-
endif::[]
8682
ifeval::["{context}" == "installation-config-parameters-ibm-power"]
8783
:ibm-power:
8884
endif::[]
@@ -2094,10 +2090,7 @@ endif::[]
20942090
ifeval::["{context}" == "installation-config-parameters-ibm-z"]
20952091
:!ibm-z:
20962092
endif::[]
2097-
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
2098-
:!ibm-z:
2099-
endif::[]
2100-
ifeval::["{context}" == "installation-config-parameters-ibm-z-kvm"]
2093+
ifeval::["{context}" == "installation-config-parameters-ibm-power"]
21012094
:!ibm-power:
21022095
endif::[]
21032096
ifeval::["{context}" == "installation-config-parameters-ash"]

0 commit comments

Comments
 (0)