Merge pull request #37174 from apinnick/bz2011514-disconnected-installation

BZ2011514: Disconnected installation improvement

Author: apinnick

migrating_from_ocp_3_to_4/installing-restricted-3-4.adoc

@@ -6,13 +6,17 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-You can install the {mtc-full} ({mtc-short}) on {product-title} 3 and 4 in a restricted network environment.
-
-After you install the {mtc-full} Operator on {product-title} {product-version} by using the Operator Lifecycle Manager, you manually install the legacy {mtc-full} Operator on {product-title} 3.
+You can install the {mtc-full} ({mtc-short}) on {product-title} 3 and 4 in a restricted network environment by performing the following procedures:
 
+* Create a xref:../operators/admin/olm-restricted-networks.adoc#olm-mirror-catalog_olm-restricted-networks[mirrored Operator catalog].
++
+This process creates a `mapping.txt` file, which contains the mapping between the `registry.redhat.io` image and your mirror registry image. The `mapping.txt` file is required for installing the Operator on the source cluster.
+* Install the {mtc-full} Operator on the {product-title} {product-version} target cluster by using Operator Lifecycle Manager.
++
 By default, the {mtc-short} web console and the `Migration Controller` pod run on the target cluster. You can configure the `Migration Controller` custom resource manifest to run the {mtc-short} web console and the `Migration Controller` pod on a link:https://access.redhat.com/articles/5064151[source cluster or on a remote cluster].
 
-After you have installed {mtc-short}, you must configure an object storage to use as a replication repository.
+* Install the _legacy_ {mtc-full} Operator on the {product-title} 3 source cluster from the command line interface.
+* Configure object storage to use as a replication repository.
 
 include::modules/migration-compatibility-guidelines.adoc[leveloffset=+1]
 include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+1]

migration_toolkit_for_containers/installing-mtc-restricted.adoc

@@ -6,13 +6,21 @@ include::modules/common-attributes.adoc[]
 
 toc::[]
 
-You can install the {mtc-full} ({mtc-short}) on {product-title} 4 in a restricted network environment.
-
-After you install the {mtc-full} Operator on {product-title} {product-version} by using the Operator Lifecycle Manager, you manually install the legacy {mtc-full} Operator on the {product-title} 4 source cluster.
+You can install the {mtc-full} ({mtc-short}) on {product-title} 4 in a restricted network environment by performing the following procedures:
 
+. Create a xref:../operators/admin/olm-restricted-networks.adoc#olm-mirror-catalog_olm-restricted-networks[mirrored Operator catalog].
++
+This process creates a `mapping.txt` file, which contains the mapping between the `registry.redhat.io` image and your mirror registry image. The `mapping.txt` file is required for installing the _legacy_ {mtc-full} Operator on an {product-title} 4.2 to 4.5 source cluster.
+. Install the {mtc-full} Operator on the {product-title} {product-version} target cluster by using Operator Lifecycle Manager.
++
 By default, the {mtc-short} web console and the `Migration Controller` pod run on the target cluster. You can configure the `Migration Controller` custom resource manifest to run the {mtc-short} web console and the `Migration Controller` pod on a link:https://access.redhat.com/articles/5064151[remote cluster].
 
-After you have installed {mtc-short}, you must configure an object storage to use as a replication repository.
+. Install the {mtc-full} Operator on the source cluster:
+
+* {product-title} 4.6 or later: Install the {mtc-full} Operator by using Operator Lifecycle Manager.
+* {product-title} 4.2 to 4.5: Install the legacy {mtc-full} Operator from the command line interface.
+
+. Configure object storage to use as a replication repository.
 
 include::modules/migration-compatibility-guidelines.adoc[leveloffset=+1]
 include::modules/migration-installing-mtc-on-ocp-4.adoc[leveloffset=+1]

modules/migration-installing-legacy-operator.adoc

@@ -27,7 +27,8 @@ ifdef::installing-3-4,installing-restricted-3-4[]
 endif::[]
 ifdef::installing-restricted-3-4,installing-mtc-restricted[]
 * You must have a Linux workstation with network access in order to download files from `registry.redhat.io`.
-* You must first install the {mtc-full} Operator on the target cluster from a local registry.
+* You must create a mirror image of the Operator catalog.
+* You must install the {mtc-full} Operator from the mirrored Operator catalog on {product-title} {product-version}.
 endif::[]
 
 .Procedure
@@ -77,14 +78,14 @@ $ sudo podman cp $(sudo podman create \
 ----
 
 ifdef::installing-restricted-3-4,installing-mtc-restricted[]
-. Obtain the Operator image mapping by running the following command on the {product-title} 4 cluster:
+. Obtain the Operator image mapping by running the following command:
 +
 [source,terminal,subs="attributes+"]
 ----
 $ grep openshift-migration-legacy-rhel8-operator ./mapping.txt | grep rhmtc
 ----
 +
-The output shows the mapping between the `registry.redhat.io` image and your mirror registry image.
+The `mapping.txt` file was created when you mirrored the Operator catalog. The output shows the mapping between the `registry.redhat.io` image and your mirror registry image.
 +
 .Example output
 [source,terminal]