Merge pull request #36250 from SNiemann15/ibmz_install_49

MULTIARCH-1411,1393: Updates IBM Z for OCP 4.9

Author: kalexand-rh

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

@@ -37,6 +37,10 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
 include::modules/installation-requirements-user-infra-ibm-z-kvm.adoc[leveloffset=+1]
 
+.Additional resources
+
+* See xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments].
+
 include::modules/installation-network-user-infra.adoc[leveloffset=+2]
 
 .Additional resources

installing/installing_ibm_z/installing-ibm-z.adoc

@@ -43,6 +43,8 @@ include::modules/installation-requirements-user-infra.adoc[leveloffset=+1]
 
 * See link:http://public.dhe.ibm.com/software/dw/linux390/perf/zvm_hpav00.pdf[Scaling HyperPAV alias devices on Linux guests on z/VM] for performance optimization.
 
+* See xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments].
+
 include::modules/installation-network-user-infra.adoc[leveloffset=+2]
 
 .Additional resources
@@ -79,6 +81,8 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 
 include::modules/installation-ibm-z-user-infra-machines-iso.adoc[leveloffset=+1]
 
+include::modules/installation-user-infra-machines-static-network.adoc[leveloffset=+2]
+
 include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]
 
 include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]

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

@@ -46,6 +46,10 @@ include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
 include::modules/installation-requirements-user-infra-ibm-z-kvm.adoc[leveloffset=+1]
 
+.Additional resources
+
+* See xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments].
+
 include::modules/installation-network-user-infra.adoc[leveloffset=+2]
 
 [id="additional-resources_ibmz-network-user-infra"]
@@ -87,6 +91,8 @@ include::modules/installation-ibm-z-kvm-user-infra-machines-iso.adoc[leveloffset
 
 include::modules/installation-full-ibm-z-kvm-user-infra-machines-iso.adoc[leveloffset=+2]
 
+include::modules/installation-user-infra-machines-static-network.adoc[leveloffset=+2]
+
 include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]
 
 include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]

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

@@ -51,6 +51,8 @@ include::modules/installation-requirements-user-infra.adoc[leveloffset=+1]
 
 * See link:http://public.dhe.ibm.com/software/dw/linux390/perf/zvm_hpav00.pdf[Scaling HyperPAV alias devices on Linux guests on z/VM] for performance optimization.
 
+* See xref:../../scalability_and_performance/ibm-z-recommended-host-practices.adoc#ibm-z-recommended-host-practices[Recommended host practices for IBM Z & LinuxONE environments].
+
 include::modules/installation-network-user-infra.adoc[leveloffset=+2]
 
 .Additional resources
@@ -87,6 +89,8 @@ include::modules/installation-user-infra-generate-k8s-manifest-ignition.adoc[lev
 
 include::modules/installation-ibm-z-user-infra-machines-iso.adoc[leveloffset=+1]
 
+include::modules/installation-user-infra-machines-static-network.adoc[leveloffset=+2]
+
 include::modules/installation-installing-bare-metal.adoc[leveloffset=+1]
 
 include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1]

modules/installation-bare-metal-config-yaml.adoc

@@ -217,6 +217,7 @@ currently define a single machine pool, it is possible that future versions
 of {product-title} will support defining multiple compute pools during
 installation. Only one control plane pool is used.
 <3> Specifies whether to enable or disable simultaneous multithreading (SMT), or hyperthreading. By default, SMT is enabled to increase the performance of the cores in your machines. You can disable it by setting the parameter value to `Disabled`. If you disable SMT, you must disable it in all cluster machines; this includes both control plane and compute machines.
+ifndef::ibm-z,ibm-z-kvm[]
 +
 [NOTE]
 ====
@@ -225,8 +226,21 @@ Simultaneous multithreading (SMT) is enabled by default. If SMT is not enabled i
 +
 [IMPORTANT]
 ====
-If you disable `hyperthreading`, whether in the BIOS or in the `install-config.yaml`, ensure that your capacity planning accounts for the dramatically decreased machine performance.
+If you disable `hyperthreading`, whether in the BIOS or in the `install-config.yaml` file, ensure that your capacity planning accounts for the dramatically decreased machine performance.
+====
+endif::ibm-z,ibm-z-kvm[]
+ifdef::ibm-z,ibm-z-kvm[]
++
+[NOTE]
+====
+Simultaneous multithreading (SMT) is enabled by default. If SMT is not available on your {product-title} nodes, the `hyperthreading` parameter has no effect.
+====
++
+[IMPORTANT]
+====
+If you disable `hyperthreading`, whether on your {product-title} nodes or in the `install-config.yaml` file, ensure that your capacity planning accounts for the dramatically decreased machine performance.
 ====
+endif::ibm-z,ibm-z-kvm[]
 <4> You must set this value to `0` when you install {product-title} on user-provisioned infrastructure. In installer-provisioned installations, the parameter controls the number of compute machines that the cluster creates and manages for you. In user-provisioned installations, you must manually deploy the compute machines before you finish installing the cluster.
 +
 [NOTE]

modules/installation-configuration-parameters.adoc

@@ -387,6 +387,10 @@ endif::bare[]
 The IP address blocks for machines.
 
 If you specify multiple IP address blocks, the blocks must not overlap.
+
+ifdef::ibm-z,ibm-power[]
+If you specify multiple IP kernel arguments, the `machineNetwork.cidr` value must be the CIDR of the primary network.
+endif::ibm-z,ibm-power[]
 |An array of objects. For example:
 
 [source,yaml]

modules/installation-user-infra-machines-static-network.adoc

@@ -6,6 +6,32 @@
 // * installing/installing_platform_agnostic/installing-platform-agnostic.adoc
 // * installing/installing_ibm_power/installing-ibm-power.adoc
 // * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
+// * installing/installing_ibm_z/installing-ibm-z.adoc
+// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
+// * installing/installing_ibm_power/installing-ibm-power.adoc
+// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
+
+ifeval::["{context}" == "installing-ibm-z"]
+:ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-ibm-z-kvm"]
+:ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
+:ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-ibm-power"]
+:ibm-power:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
+:ibm-power:
+:restricted:
+endif::[]
 
 [id="installation-user-infra-machines-static-network_{context}"]
 = Advanced {op-system} installation reference
@@ -56,12 +82,29 @@ nameserver=4.4.4.41
 ----
 
 a|Specify multiple network interfaces by specifying multiple `ip=` entries.
+
 a|
 ----
 ip=10.10.10.2::10.10.10.254:255.255.255.0:core0.example.com:enp1s0:none
 ip=10.10.10.3::10.10.10.254:255.255.255.0:core0.example.com:enp2s0:none
 ----
 
+a|Optional: You can configure routes to additional networks by setting an `rd.route=` value. 
+
+If the additional network gateway is different from the primary network gateway, the default gateway must be the primary network gateway.
+a|
+To configure the default gateway: 
+
+----
+ip=::10.10.10.254::::
+----
+
+To configure the route for the additional network:
+
+----
+rd.route=20.20.20.0/24:20.20.20.254:enp2s0
+---- 
+
 a|Disable DHCP on a single interface, such as when there are two or more network interfaces and only one interface is being used. In the example, the `enp1s0` interface has a static networking configuration and DHCP is disabled for `enp2s0`, which is not used.
 a|
 ----
@@ -149,7 +192,7 @@ vlan=bond0.100:bond0
 ----
 
 |===
-
+ifndef::ibm-z,ibm-power[]
 [id="installation-user-infra-machines-coreos-installer-options_{context}"]
 == `coreos-installer` options for ISO installations
 
@@ -351,3 +394,24 @@ a|`ignition.config.url`
 
 a|Optional: The URL of the Ignition config for the live boot. For example, this can be used to customize how `coreos-installer` is invoked, or to run code before or after the installation. This is different from `coreos.inst.ignition_url`, which is the Ignition config for the installed system.
 |===
+
+endif::ibm-z,ibm-power[]
+
+ifeval::["{context}" == "installing-ibm-z"]
+:!ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-ibm-z-kvm"]
+:!ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:!ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
+:!ibm-z:
+endif::[]
+ifeval::["{context}" == "installing-ibm-power"]
+:!ibm-power:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
+:!ibm-power:
+endif::[]