Merge pull request #20621 from kalexand-rh/enterprise-4.2

[enterprise-4.2] bug1766480: improving conditionals for internet requirements

Author: kalexand-rh

modules/cluster-entitlements.adoc

@@ -19,10 +19,25 @@
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_ibm_z/installing-ibm-z.adoc
 
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:restricted:
+endif::[]
+
 [id="cluster-entitlements_{context}"]
 = Internet and Telemetry access for {product-title}
 
-In {product-title} {product-version}, you require access to the internet to install and entitle your cluster. The Telemetry service, which runs by default to provide metrics about cluster health and the success of updates, also requires internet access. If your cluster is connected to the internet, Telemetry runs automatically, and your cluster is registered to the link:https://cloud.redhat.com/openshift[{cloud-redhat-com}]. From there, you can allocate entitlements to your cluster.
+In {product-title} {product-version}, you require access to the internet to
+ifndef::restricted[]
+install and
+endif::restricted[]
+ifdef::restricted[]
+obtain the images that you require to install the cluster and to
+endif::restricted[]
+entitle your cluster.
+The Telemetry service, which runs by default to provide metrics about cluster health and the success of updates, also requires internet access. If your cluster is connected to the internet, Telemetry runs automatically, and your cluster is registered to the link:https://cloud.redhat.com/openshift[{cloud-redhat-com}]. From there, you can allocate entitlements to your cluster.
 
 You must have internet access to:
 
@@ -37,3 +52,10 @@ If your cluster cannot have direct internet access, you can perform a restricted
 ====
 
 endif::openshift-origin,openshift-enterprise[]
+
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:!restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:!restricted:
+endif::[]

modules/installation-installing-bare-metal.adoc

@@ -6,6 +6,13 @@
 // * installing/installing_vsphere/installing-vsphere.adoc
 // * installing/installing_ibm_z/installing-ibm-z.adoc
 
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:restricted:
+endif::[]
+
 [id="installation-installing-bare-metal_{context}"]
 = Creating the cluster
 
@@ -20,7 +27,9 @@ Ignition config files that you generated with the installation program.
 for your cluster.
 * You used the Ignition config files to create {op-system} machines for your
 cluster.
+ifndef::restricted[]
 * Your machines have direct internet access.
+endif::restricted[]
 
 .Procedure
 
@@ -50,3 +59,10 @@ load balancer.
 You must remove the bootstrap machine from the load balancer at this point. You
 can also remove or reformat the machine itself.
 ====
+
+ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
+:!restricted:
+endif::[]
+ifeval::["{context}" == "installing-restricted-networks-vsphere"]
+:!restricted:
+endif::[]