Skip to content

Commit 803872a

Browse files
authored
Merge pull request #38795 from aireilly/fix-ztp-toc-error
BZ2023789 ZTP toc error
2 parents 1927e3a + fb56ff7 commit 803872a

File tree

4 files changed

+39
-32
lines changed

4 files changed

+39
-32
lines changed

modules/ztp-acm-preparing-to-install-disconnected-acm.adoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,14 @@ Before you can provision distributed units (DU) at scale, you must install {rh-r
1111

1212
You also use a disconnected mirror host to serve the {op-system} ISO and RootFS disk images that provision the DU bare-metal host operating system.
1313

14+
Before you install a cluster on infrastructure that you provision in a restricted network, you must mirror the required container images into that environment. You can also use this procedure in unrestricted networks to ensure your clusters only use container images that have satisfied your organizational controls on external content.
15+
16+
[IMPORTANT]
17+
====
18+
You must have access to the internet to obtain the necessary container images.
19+
In this procedure, you place the mirror registry on a mirror host
20+
that has access to both your network and the internet. If you do not have access
21+
to a mirror host, use the disconnected procedure to copy images to a device that you
22+
can move across network boundaries.
23+
====
24+
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Module included in the following assemblies:
2+
//
3+
// scalability_and_performance/ztp-deploying-disconnected.adoc
4+
5+
[id="ztp-disconnected-environment-prereqs_{context}"]
6+
= Disconnected environment prerequisites
7+
8+
You must have a container image registry that supports link:https://docs.docker.com/registry/spec/manifest-v2-2/[Docker v2-2] in the location that will host the {product-title} cluster, such as one of the following registries:
9+
10+
* link:https://www.redhat.com/en/technologies/cloud-computing/quay[Red Hat Quay]
11+
* link:https://jfrog.com/artifactory/[JFrog Artifactory]
12+
* link:https://www.sonatype.com/products/repository-oss?topnav=true[Sonatype Nexus Repository]
13+
* link:https://goharbor.io/[Harbor]
14+
15+
If you have an entitlement to Red Hat Quay, see the documentation on deploying Red Hat Quay link:https://access.redhat.com/documentation/en-us/red_hat_quay/3.5/html/deploy_red_hat_quay_for_proof-of-concept_non-production_purposes/[for proof-of-concept purposes] or link:https://access.redhat.com/documentation/en-us/red_hat_quay/3.5/html/deploy_red_hat_quay_on_openshift_with_the_quay_operator/[by using the Quay Operator]. If you need additional assistance selecting and installing a registry, contact your sales representative or Red Hat support.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Module included in the following assemblies:
2+
//
3+
// scalability_and_performance/ztp-deploying-disconnected.adoc
4+
5+
[id="ztp-installing-preparing-mirror_{context}"]
6+
= Preparing your mirror host
7+
8+
Before you perform the mirror procedure, you must prepare the host to retrieve content and push it to the remote location.

scalability_and_performance/ztp-deploying-disconnected.adoc

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,57 +31,30 @@ include::modules/ztp-du-host-networking-requirements.adoc[leveloffset=+1]
3131

3232
include::modules/ztp-acm-preparing-to-install-disconnected-acm.adoc[leveloffset=+1]
3333

34-
Before you install a cluster on infrastructure that you provision in a restricted network, you must mirror the required container images into that environment. You can also use this procedure in unrestricted networks to ensure your clusters only use container images that have satisfied your organizational controls on external content.
35-
36-
[IMPORTANT]
37-
====
38-
You must have access to the internet to obtain the necessary container images.
39-
In this procedure, you place the mirror registry on a mirror host
40-
that has access to both your network and the internet. If you do not have access
41-
to a mirror host, use the disconnected procedure to copy images to a device you
42-
can move across network boundaries with.
43-
====
44-
45-
[id="prerequisites_installing-mirroring-installation-images_{context}"]
46-
=== Prerequisites
47-
48-
* You must have a container image registry that supports link:https://docs.docker.com/registry/spec/manifest-v2-2/[Docker v2-2] in the location that will host the {product-title} cluster, such as one of the following registries:
49-
+
50-
--
51-
** link:https://www.redhat.com/en/technologies/cloud-computing/quay[Red Hat Quay]
52-
** link:https://jfrog.com/artifactory/[JFrog Artifactory]
53-
** link:https://www.sonatype.com/products/repository-oss?topnav=true[Sonatype Nexus Repository]
54-
** link:https://goharbor.io/[Harbor]
55-
--
56-
If you have an entitlement to Red Hat Quay, see the documentation on deploying Red Hat Quay link:https://access.redhat.com/documentation/en-us/red_hat_quay/3.5/html/deploy_red_hat_quay_for_proof-of-concept_non-production_purposes/[for proof-of-concept purposes] or link:https://access.redhat.com/documentation/en-us/red_hat_quay/3.5/html/deploy_red_hat_quay_on_openshift_with_the_quay_operator/[by using the Quay Operator]. If you need additional assistance selecting and installing a registry, contact your sales representative or Red Hat support.
34+
include::modules/ztp-disconnected-environment-prereqs.adoc[leveloffset=+2]
5735

5836
include::modules/installation-about-mirror-registry.adoc[leveloffset=+2]
5937

6038
.Additional resources
6139

6240
For information on viewing the CRI-O logs to view the image source, see xref:../installing/validating-an-installation.html#viewing-the-image-pull-source_validating-an-installation[Viewing the image pull source].
6341

64-
[id="installing-preparing-mirror_{context}"]
65-
=== Preparing your mirror host
66-
67-
Before you perform the mirror procedure, you must prepare the host to retrieve content
68-
and push it to the remote location.
42+
include::modules/ztp-installing-preparing-mirror.adoc[leveloffset=+2]
6943

7044
include::modules/cli-installing-cli.adoc[leveloffset=+3]
7145

72-
include::modules/installation-adding-registry-pull-secret.adoc[leveloffset=+2]
46+
include::modules/installation-adding-registry-pull-secret.adoc[leveloffset=+3]
7347

74-
include::modules/installation-mirror-repository.adoc[leveloffset=+2]
48+
include::modules/installation-mirror-repository.adoc[leveloffset=+3]
7549

76-
include::modules/ztp-acm-adding-images-to-mirror-registry.adoc[leveloffset=+2]
50+
include::modules/ztp-acm-adding-images-to-mirror-registry.adoc[leveloffset=+3]
7751

7852
include::modules/ztp-acm-installing-disconnected-rhacm.adoc[leveloffset=+1]
7953

8054
// AI
8155

8256
include::modules/ztp-ai-install-ocp-clusters-on-bare-metal.adoc[leveloffset=+1]
8357

84-
8558
// Custom resources
8659

8760
include::modules/ztp-ztp-custom-resources.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)