Merge pull request #56025 from SNiemann15/ocpbugs7600

[OCPBUGS7600] Align IBM Z install documentation

Author: stevsmit

modules/installation-infrastructure-user-infra.adoc

@@ -18,12 +18,14 @@
 ifeval::["{context}" == "installing-ibm-z"]
 :ibm-z:
 endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:ibm-z:
+endif::[]
 ifeval::["{context}" == "installing-ibm-z-kvm"]
 :ibm-z-kvm:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
 :ibm-z-kvm:
-:restricted:
 endif::[]
 
 :_content-type: PROCEDURE
@@ -98,10 +100,12 @@ Some load balancing solutions require the DNS name resolution for the cluster no
 ifeval::["{context}" == "installing-ibm-z"]
 :!ibm-z:
 endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:!ibm-z:
+endif::[]
 ifeval::["{context}" == "installing-ibm-z-kvm"]
 :!ibm-z-kvm:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
 :!ibm-z-kvm:
-:!restricted:
 endif::[]

modules/installation-installing-bare-metal.adoc

@@ -10,10 +10,16 @@
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc
 // * installing/installing_ibm_z/installing-ibm-z.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
+// * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
 
 ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
 :restricted:
 endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
+:restricted:
+endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
 :restricted:
 endif::[]
@@ -79,6 +85,9 @@ can also remove or reformat the bootstrap machine itself.
 ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
 :!restricted:
 endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
+:!restricted:
+endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
 :!restricted:
 endif::[]

modules/installation-network-user-infra.adoc

@@ -18,6 +18,7 @@
 // * installing/installing_ibm_z/installing-ibm-z.adoc
 // * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
 // * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
 // * installing/installing_ibm_z/installing-ibm-power.adoc
 // * installing/installing_ibm_z/installing-restricted-networks-ibm-power.adoc
 // * installing/installing-rhv-restricted-network.adoc
@@ -48,6 +49,10 @@ ifeval::["{context}" == "installing-ibm-z-kvm"]
 :ibm-z-kvm:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:ibm-z-restricted:
+:restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
 :restricted:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-power"]
@@ -293,9 +298,9 @@ ifndef::azure,gcp[]
 
 {product-title} clusters are configured to use a public Network Time Protocol (NTP) server by default. If you want to use a local enterprise NTP server, or if your cluster is being deployed in a disconnected network, you can configure the cluster to use a specific time server. For more information, see the documentation for _Configuring chrony time service_.
 
-ifndef::ibm-z[]
+ifndef::ibm-z,ibm-z-restricted[]
 If a DHCP server provides NTP server information, the chrony time service on the {op-system-first} machines read the information and can sync the clock with the NTP servers.
-endif::ibm-z[]
+endif::ibm-z,ibm-z-restricted[]
 endif::azure,gcp[]
 
 ifeval::["{context}" == "installing-vmc-user-infra"]
@@ -314,6 +319,10 @@ ifeval::["{context}" == "installing-ibm-z-kvm"]
 :!ibm-z-kvm:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-z"]
+:!ibm-z-restricted:
+:!restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-ibm-z-kvm"]
 :!restricted:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-ibm-power"]

modules/installation-requirements-user-infra-ibm-z-kvm.adoc

@@ -151,7 +151,7 @@ Each cluster virtual machine must meet the following minimum requirements:
 === Hardware requirements
 
 * Three LPARS that each have the equivalent of six IFLs, which are SMT2 enabled, for each cluster.
-* Two network connections to connect to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.
+* Two network connections to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.
 
 [discrete]
 === Operating system requirements

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

@@ -5,31 +5,31 @@
 
 :_content-type: CONCEPT
 [id="preferred-ibm-z-system-requirements_{context}"]
-= Preferred IBM Z system environment
+= Preferred {ibmzProductName} system environment
 
 [discrete]
 == Hardware requirements
 
-* 3 LPARS that each have the equivalent of 6 IFLs, which are SMT2 enabled, for each cluster.
-* Two network connections to connect to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.
+* Three LPARS that each have the equivalent of six IFLs, which are SMT2 enabled, for each cluster.
+* Two network connections to both connect to the `LoadBalancer` service and to serve data for traffic outside the cluster.
 * HiperSockets, which are attached to a node either directly as a device or by bridging with one z/VM VSWITCH to be transparent to the z/VM guest. To directly connect HiperSockets to a node, you must set up a gateway to the external network via a {op-system-base} 8 guest to bridge to the HiperSockets network.
 
 [discrete]
 == Operating system requirements
 
-* 2 or 3 instances of z/VM 7.1 or later for high availability
+* Two or three instances of z/VM 7.1 or later for high availability
 
 On your z/VM instances, set up:
 
-* 3 guest virtual machines for {product-title} control plane machines, one per z/VM instance.
-* At least 6 guest virtual machines for {product-title} compute machines, distributed across the z/VM instances.
-* 1 guest virtual machine for the temporary {product-title} bootstrap machine.
+* Three guest virtual machines for {product-title} control plane machines, one per z/VM instance.
+* At least six guest virtual machines for {product-title} compute machines, distributed across the z/VM instances.
+* One guest virtual machine for the temporary {product-title} bootstrap machine.
 * To ensure the availability of integral components in an overcommitted environment, increase the priority of the control plane by using the CP command `SET SHARE`. Do the same for infrastructure nodes, if they exist. See link:https://www.ibm.com/docs/en/zvm/7.1?topic=commands-set-share[SET SHARE] in IBM Documentation.
 
 [discrete]
-== IBM Z network connectivity requirements
+== {ibmzProductName} network connectivity requirements
 
-To install on IBM Z under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need:
+To install on {ibmzProductName} under z/VM, you require a single z/VM virtual NIC in layer 2 mode. You also need:
 
 *   A direct-attached OSA or RoCE network adapter
 *   A z/VM VSwitch set up. For a preferred setup, use OSA link aggregation.

modules/ssh-agent-using.adoc

@@ -52,7 +52,9 @@
 // * installing/installing_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc
 // * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
 // * installing/installing_ibm_z/installing-ibm-z.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
 // * installing/installing_ibm_z/installing-ibm-z-kvm.adoc
+// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
 // * installing/installing_ibm_z/installing-ibm-power.adoc
 // * installing/installing-rhv-restricted-network.adoc
 // * installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc
@@ -117,11 +119,14 @@ ifeval::["{context}" == "installing-ibm-z"]
 :ibm-z:
 endif::[]
 ifeval::["{context}" == "installing-ibm-z-kvm"]
-: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-rhv-default"]
 :rhv:
 endif::[]
@@ -147,7 +152,7 @@ If you want to SSH in to your cluster nodes to perform installation debugging or
 Do not skip this procedure in production environments, where disaster recovery and debugging is required.
 ====
 
-ifndef::osp,ibm-z,ibm-z-kvm,rhv[]
+ifndef::osp,ibm-z,rhv[]
 [NOTE]
 ====
 You must use a local key, not one that you configured with platform-specific
@@ -297,14 +302,17 @@ ifeval::["{context}" == "installing-ibm-z"]
 :!ibm-z:
 endif::[]
 ifeval::["{context}" == "installing-ibm-z-kvm"]
-:!ibm-z-kvm:
+:!ibm-z:
 endif::[]
 ifeval::["{context}" == "installing-rhv-default"]
 :!rhv:
 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-rhv-customizations"]
 :!rhv:
 endif::[]