Skip to content

Commit 031cc28

Browse files
authored
Merge pull request #20620 from openshift-cherrypick-robot/cherry-pick-20618-to-enterprise-4.4
[enterprise-4.4] bug1766480: improving conditionals for internet requirements
2 parents 9ed907f + 7d1dde4 commit 031cc28

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

modules/cluster-entitlements.adoc

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,25 @@
2525
// * installing/installing_vsphere/installing-vsphere.adoc
2626
// * installing/installing_ibm_z/installing-ibm-z.adoc
2727

28+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
29+
:restricted:
30+
endif::[]
31+
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
32+
:restricted:
33+
endif::[]
34+
2835
[id="cluster-entitlements_{context}"]
2936
= Internet and Telemetry access for {product-title}
3037

31-
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.
38+
In {product-title} {product-version}, you require access to the internet to
39+
ifndef::restricted[]
40+
install and
41+
endif::restricted[]
42+
ifdef::restricted[]
43+
obtain the images that you require to install the cluster and to
44+
endif::restricted[]
45+
entitle your cluster.
46+
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.
3247

3348
You must have internet access to:
3449

@@ -43,3 +58,10 @@ If your cluster cannot have direct internet access, you can perform a restricted
4358
====
4459

4560
endif::openshift-origin,openshift-enterprise,openshift-webscale[]
61+
62+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
63+
:!restricted:
64+
endif::[]
65+
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
66+
:!restricted:
67+
endif::[]

modules/installation-installing-bare-metal.adoc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
// * installing/installing_vsphere/installing-vsphere.adoc
77
// * installing/installing_ibm_z/installing-ibm-z.adoc
88

9+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
10+
:restricted:
11+
endif::[]
12+
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
13+
:restricted:
14+
endif::[]
15+
916
[id="installation-installing-bare-metal_{context}"]
1017
= Creating the cluster
1118

@@ -20,7 +27,9 @@ Ignition config files that you generated with the installation program.
2027
for your cluster.
2128
* You used the Ignition config files to create {op-system} machines for your
2229
cluster.
30+
ifndef::restricted[]
2331
* Your machines have direct internet access.
32+
endif::restricted[]
2433

2534
.Procedure
2635

@@ -50,3 +59,10 @@ load balancer.
5059
You must remove the bootstrap machine from the load balancer at this point. You
5160
can also remove or reformat the machine itself.
5261
====
62+
63+
ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
64+
:!restricted:
65+
endif::[]
66+
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
67+
:!restricted:
68+
endif::[]

0 commit comments

Comments
 (0)