openshift · apinnick · Jun 23, 2021 · Jun 20, 2021
diff --git a/_topic_map.yml b/_topic_map.yml
@@ -1945,6 +1945,8 @@ Topics:
   File: premigration-checklists
 - Name: Migrating your applications
   File: migrating-applications-3-4
+- Name: Advanced migration options
+  File: advanced-migration-options-3-4
 - Name: Troubleshooting
   File: troubleshooting-3-4
 ---
@@ -1964,6 +1966,8 @@ Topics:
   File: premigration-checklists
 - Name: Migrating your applications
   File: migrating-applications-with-mtc
+- Name: Advanced migration options
+  File: advanced-migration-options-mtc
 - Name: Troubleshooting
   File: troubleshooting-mtc
 ---

diff --git a/migrating_from_ocp_3_to_4/about-mtc-3-4.adoc b/migrating_from_ocp_3_to_4/about-mtc-3-4.adoc
@@ -18,11 +18,7 @@ The {mtc-short} console is installed on the target cluster by default. You can c
 
 {mtc-short} supports the file system and snapshot data copy methods for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider.
 
-You can use migration hooks to run Ansible playbooks at certain points during the migration. The hooks are added when you create a migration plan.
-
 The service catalog is deprecated in {product-title} 4. You can migrate workload resources provisioned with the service catalog from {product-title} 3 to 4 but you cannot perform service catalog actions such as `provision`, `deprovision`, or `update` on these workloads after migration. The {mtc-short} console displays a message if the service catalog resources cannot be migrated.
 
 include::modules/migration-mtc-workflow.adoc[leveloffset=+1]
-include::modules/migration-mtc-custom-resources.adoc[leveloffset=+1]
 include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
-include::modules/migration-about-migration-hooks.adoc[leveloffset=+1]
diff --git a/migrating_from_ocp_3_to_4/advanced-migration-options-3-4.adoc b/migrating_from_ocp_3_to_4/advanced-migration-options-3-4.adoc
@@ -0,0 +1,46 @@
+[id="advanced-migration-options-3-4_{context}"]
+= Advanced migration options
+include::modules/common-attributes.adoc[]
+:context: advanced-migration-options-3-4
+:advanced-migration-options-3-4:
+
+toc::[]
+
+This section describes advanced options for automating your migration and for modifying the migration plan.
+
+[discrete]
+[id="additional-resources_{context}"]
+=== Additional resources
+
+* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-workflow_about-mtc-3-4[{mtc-short} workflow]
+
+[id="mtc-custom-resources_{context}"]
+== {mtc-short} custom resources
+
+This section describes the custom resources (CRs) that are used by the {mtc-full} ({mtc-short}).
+
+include::modules/migration-about-mtc-custom-resources.adoc[leveloffset=+2]
+include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2]
+
+[id="migrating-your-applications-api_{context}"]
+== Migrating your applications with the {mtc-short} API
+
+This section describes how to migrate your applications with the {mtc-short} API from the command line interface (CLI).
+
+include::modules/migration-about-migrating-applications-api.adoc[leveloffset=+2]
+include::modules/migration-prerequisites.adoc[leveloffset=+2]
+include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+3]
+include::modules/migration-migrating-applications-api.adoc[leveloffset=+2]
+
+[id="migration-hooks_{context}"]
+== Migration hooks
+
+You can use migration hooks to run custom code at certain points during a migration.
+
+include::modules/migration-about-migration-hooks.adoc[leveloffset=+2]
+include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2]
+
+include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+1]
+include::modules/migration-excluding-resources.adoc[leveloffset=+1]
+
+:advanced-migration-options-3-4!:
diff --git a/migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc b/migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc
@@ -17,15 +17,6 @@ include::modules/migration-prerequisites.adoc[leveloffset=+1]
 * xref:../migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc#migration-updating-deprecated-internal-images_troubleshooting-3-4[Updating deprecated internal images]
 
 include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+2]
-include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2]
-
-[discrete]
-[id="additional-resources-for-migration-hooks_{context}"]
-=== Additional resources for migration hooks
-
-* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-about-migration-hooks_about-mtc-3-4[About migration hooks]
-* xref:../migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc#mighook_migrating-applications-3-4[MigHook custom resource]
-* xref:../migrating_from_ocp_3_to_4/migrating-applications-3-4.adoc#migplan_migrating-applications-3-4[MigPlan custom resource]
 
 [id="migrating-applications-mtc-web-console_{context}"]
 == Migrating your applications by using the {mtc-short} web console
@@ -46,45 +37,4 @@ include::modules/migration-creating-migration-plan-cam.adoc[leveloffset=+2]
 
 include::modules/migration-running-migration-plan-cam.adoc[leveloffset=+2]
 
-[id="migrating-applications-mtc-cli_{context}"]
-== Migrating your applications from the command line
-
-You can migrate your applications on the command line by creating or editing the {mtc-short} custom resource (CR) manifests.
-
-You can migrate applications from a local cluster to a remote cluster, from a remote cluster to a local cluster, and between remote clusters.
-
-[discrete]
-[id="cluster-terminology_{context}"]
-=== Cluster terminology
-
-The following terms are relevant for configuring clusters:
-
-* `host` cluster:
-** The `migration-controller` pod runs on the `host` cluster.
-** A `host` cluster does not require an exposed secure registry route for direct image migration.
-* Local cluster: The local cluster is often the same as the `host` cluster but this is not a requirement.
-* Remote cluster:
-** A remote cluster must have an exposed secure registry route for direct image migration.
-** A remote cluster must have a `Secret` CR containing the `migration-controller` service account token.
-
-The following terms are relevant for performing a migration:
-
-* Source cluster: Cluster from which the applications are migrated.
-* Destination cluster: Cluster to which the applications are migrated.
-
-include::modules/migration-migrating-applications-api.adoc[leveloffset=+2]
-include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2]
-
-[discrete]
-[id="additional-resources-for-custom-resources_{context}"]
-=== Additional resources for custom resources
-
-* xref:../migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc#migration-viewing-migration-crs_troubleshooting-3-4[Viewing migration custom resources]
-
-[id="configuring-migration-plan_{context}"]
-== Configuring a migration plan
-
-You can increase the number of objects to be migrated or exclude resources from the migration.
-
-include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+2]
-include::modules/migration-excluding-resources.adoc[leveloffset=+2]
+:migrating-applications-3-4!:
diff --git a/migrating_from_ocp_3_to_4/premigration-checklists.adoc b/migrating_from_ocp_3_to_4/premigration-checklists.adoc
@@ -48,7 +48,8 @@ Even if the pods are in a *Running* state, a high restart count might indicate u
 $ oc adm prune images
 ----
 
-* [ ] The internal container image registry uses a link:https://docs.openshift.com/container-platform/3.11/scaling_performance/optimizing_storage.html#registry[supported storage type].
+* [ ] The internal registry uses a link:https://docs.openshift.com/container-platform/3.11/scaling_performance/optimizing_storage.html#registry[supported storage type].
+* [ ] Direct image migration only: The internal registry is link:https://docs.openshift.com/container-platform/3.11/install_config/registry/securing_and_exposing_registry.html#exposing-the-registry[exposed] to external traffic.
 * [ ] You can read and write images to the registry.
 * [ ] The link:https://access.redhat.com/articles/3093761[etcd cluster] is healthy.
 * [ ] The link:https://docs.openshift.com/container-platform/3.11/install_config/master_node_configuration.html#master-node-configuration-node-qps-burst[average API server response time] on the source cluster is less than 50 ms.

diff --git a/migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc b/migrating_from_ocp_3_to_4/troubleshooting-3-4.adoc
@@ -18,14 +18,14 @@ include::modules/migration-using-mig-log-reader.adoc[leveloffset=+2]
 include::modules/migration-using-must-gather.adoc[leveloffset=+2]
 include::modules/migration-debugging-velero-resources.adoc[leveloffset=+2]
 include::modules/migration-partial-failure-velero.adoc[leveloffset=+2]
-include::modules/migration-viewing-migration-crs.adoc[leveloffset=+2]
+include::modules/migration-using-mtc-crs-for-troubleshooting.adoc[leveloffset=+2]
 
 [discrete]
 [id="additional-resources-for-debugging-tools_{context}"]
 === Additional resources for debugging tools
 
 * xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-workflow_about-mtc-3-4[{mtc-short} workflow]
-* xref:../migrating_from_ocp_3_to_4/about-mtc-3-4.adoc#migration-mtc-custom-resources_about-mtc-3-4[{mtc-short} custom resources]
+* xref:../migrating_from_ocp_3_to_4/advanced-migration-options-3-4.adoc#mtc-custom-resources_advanced-migration-options-3-4[{mtc-short} custom resources]
 
 [id="common-issues-and-concerns_{context}"]
 == Common issues and concerns

diff --git a/migration-toolkit-for-containers/about-mtc.adoc b/migration-toolkit-for-containers/about-mtc.adoc
@@ -11,9 +11,5 @@ The {mtc-short} console is installed on the target cluster by default. You can c
 
 {mtc-short} supports the file system and snapshot data copy methods for migrating data from the source cluster to the target cluster. You can select a method that is suited for your environment and is supported by your storage provider.
 
-You can use migration hooks to run Ansible playbooks at certain points during the migration. The hooks are added when you create a migration plan.
-
 include::modules/migration-mtc-workflow.adoc[leveloffset=+1]
-include::modules/migration-mtc-custom-resources.adoc[leveloffset=+1]
 include::modules/migration-understanding-data-copy-methods.adoc[leveloffset=+1]
-include::modules/migration-about-migration-hooks.adoc[leveloffset=+1]
diff --git a/migration-toolkit-for-containers/advanced-migration-options-mtc.adoc b/migration-toolkit-for-containers/advanced-migration-options-mtc.adoc
@@ -0,0 +1,43 @@
+[id="advanced-migration-options-mtc_{context}"]
+= Advanced migration options
+include::modules/common-attributes.adoc[]
+:context: advanced-migration-options-mtc
+
+toc::[]
+
+This section describes advanced options for automating your migration and for modifying the migration plan.
+
+[discrete]
+[id="additional-resources_{context}"]
+=== Additional resources
+
+* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-mtc-workflow_about-mtc[{mtc-short} workflow]
+
+[id="mtc-custom-resources_{context}"]
+== {mtc-short} custom resources
+
+This section describes the custom resources (CRs) that are used by the {mtc-full} ({mtc-short}).
+
+include::modules/migration-about-mtc-custom-resources.adoc[leveloffset=+2]
+include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2]
+
+[id="migrating-your-applications-api_{context}"]
+== Migrating your applications with the {mtc-short} API
+
+This section describes how to migrate your applications with the {mtc-short} API from the command line interface (CLI).
+
+include::modules/migration-about-migrating-applications-api.adoc[leveloffset=+2]
+include::modules/migration-prerequisites.adoc[leveloffset=+2]
+include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+3]
+include::modules/migration-migrating-applications-api.adoc[leveloffset=+2]
+
+[id="migration-hooks_{context}"]
+== Migration hooks
+
+You can use migration hooks to run custom code at certain points during a migration.
+
+include::modules/migration-about-migration-hooks.adoc[leveloffset=+2]
+include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2]
+
+include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+1]
+include::modules/migration-excluding-resources.adoc[leveloffset=+1]
diff --git a/migration-toolkit-for-containers/migrating-applications-with-mtc.adoc b/migration-toolkit-for-containers/migrating-applications-with-mtc.adoc
@@ -9,15 +9,6 @@ You can migrate your applications by using the {mtc-full} ({mtc-short}) web cons
 
 include::modules/migration-prerequisites.adoc[leveloffset=+1]
 include::modules/migration-configuring-proxy-for-dvm.adoc[leveloffset=+2]
-include::modules/migration-writing-ansible-playbook-hook.adoc[leveloffset=+2]
-
-[discrete]
-[id="additional-resources-for-migration-hooks_{context}"]
-=== Additional resources for migration hooks
-
-* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-about-migration-hooks_about-mtc[About migration hooks]
-* xref:../migration-toolkit-for-containers/migrating-applications-with-mtc.adoc#mighook_migrating-applications-with-mtc[MigHook custom resource]
-* xref:../migration-toolkit-for-containers/migrating-applications-with-mtc#migplan_migrating-applications-with-mtc[MigPlan custom resource]
 
 [id="migrating-applications-mtc-web-console_{context}"]
 == Migrating your applications by using the {mtc-short} web console
@@ -37,46 +28,3 @@ include::modules/migration-creating-migration-plan-cam.adoc[leveloffset=+2]
 * xref:../migration-toolkit-for-containers/about-mtc.adoc#snapshot-copy-method_about-mtc[{mtc-short} snapshot copy method]
 
 include::modules/migration-running-migration-plan-cam.adoc[leveloffset=+2]
-
-[id="migrating-applications-mtc-cli_{context}"]
-== Migrating your applications from the command line
-
-You can migrate your applications on the command line by creating or editing the {mtc-short} custom resource (CR) manifests.
-
-You can migrate applications from a local cluster to a remote cluster, from a remote cluster to a local cluster, and between remote clusters.
-
-[discrete]
-[id="cluster-terminology_{context}"]
-=== Cluster terminology
-
-The following terms are relevant for configuring clusters:
-
-* `host` cluster:
-** The `migration-controller` pod runs on the `host` cluster.
-** A `host` cluster does not require an exposed secure registry route for direct image migration.
-* Local cluster: The local cluster is often the same as the `host` cluster but this is not a requirement.
-* Remote cluster:
-** A remote cluster must have an exposed secure registry route for direct image migration.
-** A remote cluster must have a `Secret` CR containing the `migration-controller` service account token.
-
-The following terms are relevant for performing a migration:
-
-* Source cluster: Cluster from which the applications are migrated.
-* Destination cluster: Cluster to which the applications are migrated.
-
-include::modules/migration-migrating-applications-api.adoc[leveloffset=+2]
-include::modules/migration-mtc-cr-manifests.adoc[leveloffset=+2]
-
-[discrete]
-[id="additional-resources-for-custom-resources_{context}"]
-=== Additional resources for custom resources
-
-* xref:../migration-toolkit-for-containers/troubleshooting-mtc.adoc#migration-viewing-migration-crs_troubleshooting-mtc[Viewing migration custom resources]
-
-[id="configuring-migration-plan_{context}"]
-== Configuring a migration plan
-
-You can increase the number of objects to be migrated or exclude resources from the migration.
-
-include::modules/migration-changing-migration-plan-limits.adoc[leveloffset=+2]
-include::modules/migration-excluding-resources.adoc[leveloffset=+2]
diff --git a/migration-toolkit-for-containers/troubleshooting-mtc.adoc b/migration-toolkit-for-containers/troubleshooting-mtc.adoc
@@ -18,14 +18,14 @@ include::modules/migration-using-mig-log-reader.adoc[leveloffset=+2]
 include::modules/migration-using-must-gather.adoc[leveloffset=+2]
 include::modules/migration-debugging-velero-resources.adoc[leveloffset=+2]
 include::modules/migration-partial-failure-velero.adoc[leveloffset=+2]
-include::modules/migration-viewing-migration-crs.adoc[leveloffset=+2]
+include::modules/migration-using-mtc-crs-for-troubleshooting.adoc[leveloffset=+2]
 
 [discrete]
 [id="additional-resources-for-debugging-tools_{context}"]
 === Additional resources for debugging tools
 
 * xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-mtc-workflow_about-mtc[{mtc-short} workflow]
-* xref:../migration-toolkit-for-containers/about-mtc.adoc#migration-mtc-custom-resources_about-mtc[{mtc-short} custom resources]
+* xref:../migration-toolkit-for-containers/advanced-migration-options-mtc.adoc#mtc-custom-resources_advanced-migration-options-mtc[{mtc-short} custom resources]
 
 [id="common-issues-and-concerns_{context}"]
 == Common issues and concerns