Skip to content

Commit 5f8dea2

Browse files
committed
changes from review
1 parent bb93585 commit 5f8dea2

9 files changed

+61
-52
lines changed

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99
[role="_abstract"]
10-
In {product-title} version {product-version}, you can install a cluster in
11-
a logical partition (LPAR) on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision.
10+
In {product-title} version {product-version}, you can install a cluster in a logical partition (LPAR) on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision.
1211

1312
[NOTE]
1413
====
@@ -39,8 +38,7 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1]
3938
[id="installation-requirements-user-infra-lpar_{context}"]
4039
== Requirements for a cluster with user-provisioned infrastructure
4140

42-
For a cluster that contains user-provisioned infrastructure, you must deploy all
43-
of the required machines.
41+
For a cluster that contains user-provisioned infrastructure, you must deploy all of the required machines.
4442

4543
This section describes the requirements for deploying {product-title} on user-provisioned infrastructure.
4644

@@ -55,7 +53,6 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
5553
include::modules/minimum-ibm-z-system-requirements.adoc[leveloffset=+2]
5654

5755
[role="_additional-resources"]
58-
[id="additional-resources_ibmz-lpar-requirements"]
5956
.Additional resources
6057

6158
* See link:https://www.ibm.com/docs/en/systems-hardware/zsystems/3932-A02?topic=library-prsm-planning-guide[Processors Resource/Systems Manager Planning Guide] in {ibm-name} Documentation for PR/SM mode considerations.
@@ -71,7 +68,6 @@ include::modules/csr-management.adoc[leveloffset=+2]
7168
include::modules/installation-network-user-infra.adoc[leveloffset=+2]
7269

7370
[role="_additional-resources"]
74-
[id="additional-resources_ibmz_lpar-chrony-time-service"]
7571
.Additional resources
7672

7773
* xref:../../installing/install_config/installing-customizing.adoc#installation-special-config-chrony_installing-customizing[Configuring chrony time service]
@@ -137,14 +133,13 @@ include::modules/installation-complete-user-infra.adoc[leveloffset=+1]
137133
include::modules/cluster-telemetry.adoc[leveloffset=+1]
138134

139135
[role="_additional-resources"]
140-
[id="additional-resources_ibmz-lpar-remote-health-monitoring"]
141136
.Additional resources
142137

143138
* See xref:../../support/remote_health_monitoring/about-remote-health-monitoring.adoc#about-remote-health-monitoring[About remote health monitoring] for more information about the Telemetry service
144139

145140
* link:https://access.redhat.com/solutions/4387261[How to generate SOSREPORT within OpenShift4 nodes without SSH].
146141

147-
[id="next-steps_ibmz-lpar"]
142+
[id="next-steps_installing-ibm-z-lpar"]
148143
== Next steps
149144

150145
* xref:../../post_installation_configuration/machine-configuration-tasks.adoc#rhcos-enabling-multipath_post-install-machine-configuration-tasks[Enabling multipathing with kernel arguments on {op-system}].

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ include::_attributes/common-attributes.adoc[]
77
toc::[]
88

99
[role="_abstract"]
10-
In {product-title} version {product-version}, you can install a cluster in a logical partition (LPAR) on
11-
{ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted network.
10+
In {product-title} version {product-version}, you can install a cluster in a logical partition (LPAR) on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision in a restricted network.
1211

1312
[NOTE]
1413
====
@@ -63,14 +62,13 @@ include::modules/installation-minimum-resource-requirements.adoc[leveloffset=+2]
6362
include::modules/minimum-ibm-z-system-requirements.adoc[leveloffset=+2]
6463

6564
[role="_additional-resources"]
66-
[id="additional-resources_ibmz-lpar-restricted-requirements"]
6765
.Additional resources
6866

69-
* See link:https://www.ibm.com/docs/en/systems-hardware/zsystems/3932-A02?topic=library-prsm-planning-guide[Processors Resource/Systems Manager Planning Guide] in {ibm-name} Documentation for PR/SM mode considerations.
67+
* link:https://www.ibm.com/docs/en/systems-hardware/zsystems/3932-A02?topic=library-prsm-planning-guide[Processors Resource/Systems Manager Planning Guide] in {ibm-name} Documentation for PR/SM mode considerations.
7068

71-
* See link:https://www.ibm.com/docs/en/systems-hardware/zsystems/3932-A02?topic=library-dynamic-partition-manager-dpm-guide[IBM Dynamic Partition Manager (DPM) Guide] in {ibm-name} Documentation for DPM mode considerations.
69+
* link:https://www.ibm.com/docs/en/systems-hardware/zsystems/3932-A02?topic=library-dynamic-partition-manager-dpm-guide[IBM Dynamic Partition Manager (DPM) Guide] in {ibm-name} Documentation for DPM mode considerations.
7270

73-
* See link:https://www.vm.ibm.com/library/presentations/lparperf.pdf[Topics in LPAR performance] for LPAR weight management and entitlements.
71+
* link:https://www.vm.ibm.com/library/presentations/lparperf.pdf[Topics in LPAR performance] for LPAR weight management and entitlements.
7472

7573
* xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for {ibm-z-name} & {ibm-linuxone-name} environments]
7674

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ The {product-title} installation program offers the following methods for deploy
2727

2828
* *Interactive*: You can deploy a cluster with the web-based link:https://access.redhat.com/documentation/en-us/assisted_installer_for_openshift_container_platform[{ai-full}]. This method requires no setup for the installer, and is ideal for connected environments like {ibm-z-name}.
2929

30-
* *Local Agent-based*: You can deploy a cluster locally with the xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#preparing-to-install-with-agent-based-installer[agent-based installer] for air-gapped or restricted networks. It provides many of the benefits of the {ai-full}, but you must download and configure the link:https://console.redhat.com/openshift/install/ibmz/agent-based[agent-based installer] first. Configuration is done with a command line interface (CLI). This approach is ideal for air-gapped or restricted networks.
30+
* *Local Agent-based*: You can deploy a cluster locally with the xref:../../installing/installing_with_agent_based_installer/preparing-to-install-with-agent-based-installer.adoc#preparing-to-install-with-agent-based-installer[Agent-based Installer]. It provides many of the benefits of the {ai-full}, but you must download and configure the link:https://console.redhat.com/openshift/install/ibmz/agent-based[Agent-based Installer] first. Configuration is done with a command line interface (CLI).
31+
// with 4.15 only connected for IBM Z. I will readd this sentence once air-gaped works: This approach is ideal for air-gapped or restricted networks.
3132
//agent-based link for IBM Z not available yet needs to be verified shortly before GA
32-
* *Full control*: You can deploy a cluster on xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[infrastructure that you prepare and maintain], which provides maximum customizability. You can deploy clusters with both connected or air-gapped or restricted networks.
33+
34+
* *Full control*: You can deploy a cluster on xref:../../installing/installing_ibm_z/installing-ibm-z.adoc#installing-ibm-z[infrastructure that you prepare and maintain], which provides maximum customizability. You can deploy clusters in connected or disconnected environments.
3335

3436
.{ibm-z-name} installation options
3537
[cols="4,1,1,1,1",options="header"]
@@ -73,7 +75,7 @@ The {product-title} installation program offers the following methods for deploy
7375
|
7476
|===
7577

76-
See the xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process] for more information about the installation processes.
78+
For more information about the installation process, see the xref:../../architecture/architecture-installation.adoc#installation-process_architecture-installation[Installation process].
7779

7880
=== User-provisioned infrastructure installation of {product-title} on {ibm-z-title}
7981

@@ -86,12 +88,12 @@ The steps for performing a user-provisioned infrastructure installation are prov
8688

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

89-
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with z/VM on {ibm-z-name} or {ibm-linuxone-name} 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.
91+
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc#installing-restricted-networks-ibm-z[Installing a cluster with z/VM on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with z/VM on {ibm-z-name} or {ibm-linuxone-name} 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.
9092

9193
* **xref:../../installing/installing_ibm_z/installing-ibm-z-kvm.adoc#installing-ibm-z-kvm[Installing a cluster with RHEL KVM on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} with KVM on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision.
9294

93-
* **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 {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with {op-system-base} KVM on {ibm-z-name} or {ibm-linuxone-name} 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.
95+
* **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 {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} with {op-system-base} KVM on {ibm-z-name} or {ibm-linuxone-name} 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.
9496

9597
* **xref:../../installing/installing_ibm_z/installing-ibm-z-lpar.adoc#installing-ibm-z-lpar[Installing a cluster in an LPAR on {ibm-z-name} and {ibm-linuxone-name}]**: You can install {product-title} in a logical partition (LPAR) on {ibm-z-name} or {ibm-linuxone-name} infrastructure that you provision.
9698

97-
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc#installing-restricted-networks-ibm-z-lpar[Installing a cluster in an LPAR on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} in an LPAR on {ibm-z-name} or {ibm-linuxone-name} 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.
99+
* **xref:../../installing/installing_ibm_z/installing-restricted-networks-ibm-z-lpar.adoc#installing-restricted-networks-ibm-z-lpar[Installing a cluster in an LPAR on {ibm-z-name} and {ibm-linuxone-name} in a restricted network]**: You can install {product-title} in an LPAR on {ibm-z-name} or {ibm-linuxone-name} 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-complete-user-infra.adoc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ openshift-authentication-operator authentication-operator-69d5d8bf84-vh2n8
152152
...
153153
----
154154

155-
.. View the logs for a pod that is listed in the output of the previous command
156-
by using the following command:
155+
.. View the logs for a pod that is listed in the output of the previous command by using the following command:
157156
+
158157
[source,terminal]
159158
----
@@ -208,3 +207,10 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
208207
:!ibm-z-kvm:
209208
:!restricted:
210209
endif::[]
210+
ifeval::["{context}" == "installing-ibm-z-lpar"]
211+
:!ibm-z:
212+
endif::[]
213+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
214+
:!ibm-z:
215+
:!restricted:
216+
endif::[]

modules/installation-ibm-z-user-infra-machines-iso.adoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ endif::[]
2626
ifdef::ibm-z[]
2727
To install {product-title} on {ibm-z-name} infrastructure that you provision, you must install {op-system-first} on z/VM guest virtual 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} z/VM guest virtual machines have rebooted.
2828
endif::ibm-z[]
29-
ifndef::ibm-z[]
29+
ifdef::ibm-z-lpar[]
3030
To install {product-title} on {ibm-z-name} infrastructure that you provision, you must install {op-system-first} in an LPAR. 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} guest machines have rebooted.
31-
endif::ibm-z[]
31+
endif::ibm-z-lpar[]
3232

3333
Complete the following steps to create the machines.
3434

@@ -156,11 +156,11 @@ $ ipl c
156156
See link:https://www.ibm.com/docs/en/zvm/latest?topic=commands-ipl[IPL] in IBM Documentation.
157157
+
158158
endif::ibm-z[]
159-
ifndef::ibm-z[]
159+
ifdef::ibm-z-lpar[]
160160
. Transfer the initramfs, kernel, parameter files, and {op-system} images to the LPAR, for example with FTP. For details about how to transfer the files with FTP and boot, see link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/performing_a_standard_rhel_8_installation/installing-in-an-lpar_installing-rhel[Installing in an LPAR].
161161

162162
. Boot the machine
163-
endif::ibm-z[]
163+
endif::ibm-z-lpar[]
164164

165165
. Repeat this procedure for the other machines in the cluster.
166166

@@ -172,4 +172,7 @@ ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
172172
endif::[]
173173
ifeval::["{context}" == "installing-ibm-z-lpar"]
174174
:!ibm-z-lpar:
175+
endif::[]
176+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
177+
:!ibm-z-lpar:
175178
endif::[]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Before you install {product-title}, you must provision the API and application I
2626
endif::user-managed-lb[]
2727

2828
ifdef::user-managed-lb[]
29-
3029
Before you install {product-title}, you can provision your own API and application ingress load balancing infrastructure to use in place of the default, internal load balancing solution. In production scenarios, you can deploy the API and application Ingress load balancers separately so that you can scale the load balancer infrastructure for each in isolation.
3130
endif::user-managed-lb[]
3231

modules/installation-three-node-cluster.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,15 @@ endif::[]
9292
ifeval::["{context}" == "installing-ibm-z-kvm"]
9393
:!ibm-z-kvm:
9494
endif::[]
95+
ifeval::["{context}" == "installing-ibm-z-lpar"]
96+
:!ibm-z:
97+
endif::[]
9598
ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
9699
:!ibm-z:
97100
endif::[]
98101
ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
99102
:!ibm-z-kvm:
100103
endif::[]
104+
ifeval::["{context}" == "installing-restricted-networks-ibm-z-lpar"]
105+
:!ibm-z:
106+
endif::[]

modules/minimum-ibm-z-system-requirements.adoc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,28 @@ On your z/VM instance, set up:
6161
* Two guest virtual machines for {product-title} compute machines
6262
* One guest virtual machine for the temporary {product-title} bootstrap machine
6363
endif::ibm-z[]
64-
ifndef::ibm-z[]
64+
ifdef::ibm-z-lpar[]
6565
* Five logical partitions (LPARs)
6666
** Three LPARs for {product-title} control plane machines
6767
** Two LPARs for {product-title} compute machines
6868
* One machine for the temporary {product-title} bootstrap machine
69-
endif::ibm-z[]
69+
endif::ibm-z-lpar[]
7070

7171
[discrete]
7272
== {ibm-z-title} network connectivity requirements
7373

7474
ifdef::ibm-z[]
7575
To install on {ibm-z-name} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need:
7676

77-
* A direct-attached OSA or RoCE network adapter
78-
* A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation.
77+
* A direct-attached OSA or RoCE network adapter
78+
* A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation.
7979
endif::ibm-z[]
80-
ifndef::ibm-z[]
80+
ifdef::ibm-z-lpar[]
8181
To install on {ibm-z-name} in an LPAR, you need:
8282

83-
* A direct-attached OSA or RoCE network adapter
84-
* For a preferred setup, use OSA link aggregation.
85-
endif::ibm-z[]
83+
* A direct-attached OSA or RoCE network adapter
84+
* For a preferred setup, use OSA link aggregation.
85+
endif::ibm-z-lpar[]
8686

8787
[discrete]
8888
=== Disk storage
@@ -94,10 +94,10 @@ ifdef::ibm-z[]
9494
* FICON attached disk storage (DASDs). These can be z/VM minidisks, fullpack minidisks, or dedicated DASDs, all of which must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
9595
* FCP attached disk storage
9696
endif::ibm-z[]
97-
ifndef::ibm-z[]
97+
ifdef::ibm-z-lpar[]
9898
* FICON attached disk storage (DASDs). This can be dedicated DASDs that must be formatted as CDL, which is the default. To reach the minimum required DASD size for {op-system-first} installations, you need extended address volumes (EAV). If available, use HyperPAV to ensure optimal performance.
9999
* FCP attached disk storage
100-
endif::ibm-z[]
100+
endif::ibm-z-lpar[]
101101

102102
[discrete]
103103
=== Storage / Main Memory

0 commit comments

Comments
 (0)