Skip to content

Commit a9509ad

Browse files
author
Steven Smith
committed
Removes Creating a disconnected registry and moves one section to Disconnected Installation mirroring
1 parent 3945de2 commit a9509ad

9 files changed

+427
-322
lines changed

installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@ include::modules/ipi-install-configuring-raid-for-worker-node.adoc[leveloffset=+
6565

6666
include::modules/ipi-install-creating-a-disconnected-registry.adoc[leveloffset=+1]
6767

68+
[discrete]
69+
[id="prerequisites_ipi-disconnected-registry"]
70+
=== Prerequisites
71+
72+
* If you have already prepared a mirror registry for xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#prerequisites_installing-mirroring-installation-images[Mirroring images for a disconnected installation], you can skip directly to xref:../../installing/installing_bare_metal_ipi/ipi-install-installation-workflow.adoc#ipi-modify-install-config-for-a-disconnected-registry_ipi-install-installation-workflow[Modify the install-config.yaml file to use the disconnected registry].
73+
74+
include::modules/ipi-install-preparing-a-disconnected-registry.adoc[leveloffset=+2]
75+
76+
include::modules/ipi-install-mirroring-for-disconnected-registry.adoc[leveloffset=+2]
77+
78+
include::modules/ipi-modify-install-config-for-a-disconnected-registry.adoc[leveloffset=+2]
79+
6880
include::modules/ipi-install-validation-checklist-for-installation.adoc[leveloffset=+1]
6981

7082
include::modules/ipi-install-deploying-the-cluster-via-the-openshift-installer.adoc[leveloffset=+1]

modules/installation-bare-metal-config-yaml.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ ifdef::openshift-origin[]
303303
endif::openshift-origin[]
304304
endif::ibm-z,ibm-z-kvm[]
305305
ifdef::ibm-z,ibm-z-kvm[]
306-
<14> Add the `additionalTrustBundle` parameter and value. The value must be the contents of the certificate file that you used for your mirror registry, which can be an existing, trusted certificate authority or the self-signed certificate that you generated for the mirror registry.
306+
<14> Add the `additionalTrustBundle` parameter and value. The value must be the contents of the certificate file that you used for your mirror registry. The certificate file can be an existing, trusted certificate authority or the self-signed certificate that you generated for the mirror registry.
307307
endif::ibm-z,ibm-z-kvm[]
308308
ifndef::openshift-origin[]
309309
<15> Provide the `imageContentSources` section from the output of the command to mirror the repository.

modules/installation-generate-aws-user-infra-install-config.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This field is optional.
6868
endif::[]
6969

7070
ifdef::restricted[]
71-
. Edit the `install-config.yaml` file to provide the additional information that
71+
. Edit the `install-config.yaml` file to give the additional information that
7272
is required for an installation in a restricted network.
7373
.. Update the `pullSecret` value to contain the authentication information for
7474
your registry:
@@ -82,7 +82,7 @@ For `<local_registry>`, specify the registry domain name, and optionally the
8282
port, that your mirror registry uses to serve content. For example
8383
`registry.example.com` or `registry.example.com:5000`. For `<credentials>`,
8484
specify the base64-encoded user name and password for your mirror registry.
85-
.. Add the `additionalTrustBundle` parameter and value. The value must be the contents of the certificate file that you used for your mirror registry, which can be an existing, trusted certificate authority or the self-signed certificate that you generated for the mirror registry.
85+
.. Add the `additionalTrustBundle` parameter and value. The value must be the contents of the certificate file that you used for your mirror registry. The certificate file can be an existing, trusted certificate authority or the self-signed certificate that you generated for the mirror registry.
8686
+
8787
[source,yaml]
8888
----

modules/installation-initializing.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ platform:
485485
----
486486
endif::vsphere+restricted[]
487487
ifdef::restricted[]
488-
. Edit the `install-config.yaml` file to provide the additional information that
488+
. Edit the `install-config.yaml` file to give the additional information that
489489
is required for an installation in a restricted network.
490490
.. Update the `pullSecret` value to contain the authentication information for
491491
your registry:
@@ -509,7 +509,7 @@ additionalTrustBundle: |
509509
-----END CERTIFICATE-----
510510
----
511511
+
512-
The value must be the contents of the certificate file that you used for your mirror registry, which can be an existing, trusted certificate authority or the self-signed certificate that you generated for the mirror registry.
512+
The value must be the contents of the certificate file that you used for your mirror registry. The certificate file can be an existing, trusted certificate authority, or the self-signed certificate that you generated for the mirror registry.
513513
514514
ifdef::aws+restricted[]
515515
.. Define the subnets for the VPC to install the cluster in:
@@ -535,7 +535,7 @@ computeSubnet: <compute_subnet>
535535
For `platform.gcp.network`, specify the name for the existing Google VPC. For `platform.gcp.controlPlaneSubnet` and `platform.gcp.computeSubnet`, specify the existing subnets to deploy the control plane machines and compute machines, respectively.
536536
endif::gcp+restricted[]
537537
538-
.. Add the image content resources, which look like this excerpt:
538+
.. Add the image content resources, which resemble the following YAML excerpt:
539539
+
540540
[source,yaml]
541541
----
@@ -548,7 +548,7 @@ imageContentSources:
548548
source: registry.example.com/ocp/release
549549
----
550550
+
551-
To complete these values, use the `imageContentSources` that you recorded during mirror registry creation.
551+
For these values, use the `imageContentSources` that you recorded during mirror registry creation.
552552
553553
. Make any other modifications to the `install-config.yaml` file that you require. You can find more information about
554554
the available parameters in the *Installation configuration parameters* section.

0 commit comments

Comments
 (0)