Skip to content

bug 1766480: improving conditionals for internet requirements #20618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion modules/cluster-entitlements.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,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:

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

endif::openshift-origin,openshift-enterprise,openshift-webscale[]

ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
:!restricted:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
:!restricted:
endif::[]
16 changes: 16 additions & 0 deletions modules/installation-installing-bare-metal.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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::[]