diff --git a/_topic_maps/_topic_map_ms.yml b/_topic_maps/_topic_map_ms.yml index e7a90edc1a4a..6893127b1c3f 100644 --- a/_topic_maps/_topic_map_ms.yml +++ b/_topic_maps/_topic_map_ms.yml @@ -42,12 +42,6 @@ Distros: microshift Topics: - Name: Installing from an RPM package File: microshift-install-rpm -- Name: Mirroring container images for disconnected installations - File: microshift-deploy-with-mirror-registry -- Name: Embedding in a RHEL for Edge image - File: microshift-embed-in-rpm-ostree -- Name: Embedding in a RHEL for Edge image for offline use - File: microshift-embed-in-rpm-ostree-offline-use - Name: Troubleshooting installation issues File: microshift-installing-troubleshooting --- @@ -69,6 +63,17 @@ Topics: - Name: Understanding system health checks File: microshift-greenboot --- +Name: Embedding in a RHEL for Edge image +Dir: microshift_install_rpm_ostree +Distros: microshift +Topics: +- Name: Embedding in a RHEL for Edge image using image builder + File: microshift-embed-in-rpm-ostree +- Name: Mirroring container images for disconnected installations + File: microshift-deploy-with-mirror-registry +- Name: Embedding in a RHEL for Edge image for offline use + File: microshift-embed-in-rpm-ostree-offline-use +--- Name: Updating Dir: microshift_updating Distros: microshift diff --git a/microshift_configuring/microshift_low_latency/microshift-low-latency.adoc b/microshift_configuring/microshift_low_latency/microshift-low-latency.adoc index 8253684973ba..02681cc66b23 100644 --- a/microshift_configuring/microshift_low_latency/microshift-low-latency.adoc +++ b/microshift_configuring/microshift_low_latency/microshift-low-latency.adoc @@ -61,7 +61,7 @@ include::modules/microshift-low-latency-install-kernelrt-rhel-edge.adoc[leveloff Complete the build process by starting with the following procedure to embed {microshift-short}in a {op-system-ostree} image. Then complete the remaining steps in the installation documentation for installing {microshift-short} in a {op-system-ostree} image: -* xref:../../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image] +* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image] //additional resources for real-time kernel [role="_additional-resources"] @@ -71,7 +71,7 @@ Complete the build process by starting with the following procedure to embed {mi * link:https://osbuild.org/docs/on-premises/installation/managing-repositories/#using-repositories-that-require-subscription[Using repositories that require subscription] (osbuild documentation) * link:https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/composing_a_customized_rhel_system_image/creating-system-images-with-composer-command-line-interface_composing-a-customized-rhel-system-image#building-rhel-images-by-using-the-real-time-kernel_creating-system-images-with-composer-command-line-interface[Building RHEL images by using the real-time kernel] for more information. * link:https://docs.redhat.com/en/documentation/red_hat_enterprise_linux_for_real_time/9/html/installing_rhel_9_for_real_time/assembly_installing-rhel-for-real-time_installing-rhel-9-for-real-time#post-installation-instructions_assembly_installing-rhel-for-real-time[Post installation instructions] (RHEL for Real Time documentation) -* xref:../../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image] +* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image] * link:https://access.redhat.com/solutions/4096521[FAQ about RHEL for Real Time (kernel-rt)] //Can likely remove KCS after 2024 as it may go out of date diff --git a/microshift_install_rpm_ostree/_attributes b/microshift_install_rpm_ostree/_attributes new file mode 120000 index 000000000000..f27fd275ea6b --- /dev/null +++ b/microshift_install_rpm_ostree/_attributes @@ -0,0 +1 @@ +../_attributes/ \ No newline at end of file diff --git a/microshift_install_rpm_ostree/images b/microshift_install_rpm_ostree/images new file mode 120000 index 000000000000..e4c5bd02a10a --- /dev/null +++ b/microshift_install_rpm_ostree/images @@ -0,0 +1 @@ +../images/ \ No newline at end of file diff --git a/microshift_install/microshift-deploy-with-mirror-registry.adoc b/microshift_install_rpm_ostree/microshift-deploy-with-mirror-registry.adoc similarity index 100% rename from microshift_install/microshift-deploy-with-mirror-registry.adoc rename to microshift_install_rpm_ostree/microshift-deploy-with-mirror-registry.adoc diff --git a/microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc b/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc similarity index 85% rename from microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc rename to microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc index 45e3481dc129..1521aacc3310 100644 --- a/microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc +++ b/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc @@ -8,15 +8,6 @@ toc::[] Embedding {microshift-short} containers in an `rpm-ostree` commit means that you can run a cluster in air-gapped, disconnected, or offline environments. You can embed {product-title} containers in a {op-system-ostree-first} image so that container engines do not need to pull images over a network from a container registry. Workloads can start up immediately without network connectivity. -include::modules/microshift-install-system-requirements.adoc[leveloffset=+1] - -[id="embed-offline-rhde-compatibility-table"] -== Compatibility table - -Plan to pair a supported version of {op-system-ostree} with the {microshift-short} version you are using as described in the following compatibility table: - -include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1] - include::modules/microshift-embed-microshift-image-offline-deploy.adoc[leveloffset=+1] include::modules/microshift-embed-microshift-update-osbuilder-worker.adoc[leveloffset=+1] diff --git a/microshift_install/microshift-embed-in-rpm-ostree.adoc b/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc similarity index 87% rename from microshift_install/microshift-embed-in-rpm-ostree.adoc rename to microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc index b7c0c8b861ca..a93a7984304b 100644 --- a/microshift_install/microshift-embed-in-rpm-ostree.adoc +++ b/microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="microshift-embed-in-rpm-ostree"] -= Embedding in a {op-system-ostree} image += Embedding in a {op-system-ostree} image using image builder include::_attributes/attributes-microshift.adoc[] :context: microshift-embed-in-rpm-ostree @@ -8,17 +8,6 @@ toc::[] You can embed {microshift-short} into a {op-system-ostree-first} image. Use this guide to build a {op-system} image containing {microshift-short}. -include::modules/microshift-install-system-requirements.adoc[leveloffset=+1] - -Plan to use a supported version of {op-system} paired with your version of {microshift-short} as described in the following table. - -[id="embed-ostree-rhde-compatibility-table"] -== Compatibility table - -Plan to pair a supported version of {op-system-ostree} with the {microshift-short} version you are using as described in the following compatibility table: - -include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1] - include::modules/microshift-preparing-for-image-building.adoc[leveloffset=+1] include::modules/microshift-adding-repos-to-image-builder.adoc[leveloffset=+1] @@ -46,7 +35,7 @@ include::modules/microshift-ca-adding-bundle-ostree.adoc[leveloffset=+2] [role="_additional-resources"] .Additional resources -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/securing_networks/using-shared-system-certificates_securing-networks[Using Shared System Certificates ({op-system-base} 9)] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_a_customized_rhel_system_image/creating-system-images-with-composer-command-line-interface_composing-a-customized-rhel-system-image#image-customizations_creating-system-images-with-composer-command-line-interface[Supported image customizations ({op-system-base} 9)] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images/creating-and-managing-ostree-image-updates_composing-installing-managing-rhel-for-edge-images[Creating and managing OSTree image updates] diff --git a/microshift_install_rpm_ostree/modules b/microshift_install_rpm_ostree/modules new file mode 120000 index 000000000000..43aab75b53c9 --- /dev/null +++ b/microshift_install_rpm_ostree/modules @@ -0,0 +1 @@ +../modules/ \ No newline at end of file diff --git a/microshift_install_rpm_ostree/snippets b/microshift_install_rpm_ostree/snippets new file mode 120000 index 000000000000..9d58b92e5058 --- /dev/null +++ b/microshift_install_rpm_ostree/snippets @@ -0,0 +1 @@ +../snippets/ \ No newline at end of file diff --git a/microshift_running_apps/microshift-embed-apps-offline-use.adoc b/microshift_running_apps/microshift-embed-apps-offline-use.adoc index 7179c162e292..b51af75bec50 100644 --- a/microshift_running_apps/microshift-embed-apps-offline-use.adoc +++ b/microshift_running_apps/microshift-embed-apps-offline-use.adoc @@ -17,10 +17,10 @@ include::modules/microshift-embed-images-offline-use.adoc[leveloffset=+1] * xref:../microshift_running_apps/microshift-embedded-apps-on-rhel-edge.adoc#microshift-embedded-apps-on-rhel-edge[Options for embedding {product-title} applications in a {op-system-ostree} image] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-add-blueprint-build-iso_microshift-embed-in-rpm-ostree[Add the blueprint to image builder and build the ISO] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-add-blueprint-build-iso_microshift-embed-in-rpm-ostree[Add the blueprint to Image Builder and build the ISO] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-download-iso-prep-for-use_microshift-embed-in-rpm-ostree[Download the ISO and prepare it for use] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-download-iso-prep-for-use_microshift-embed-in-rpm-ostree[Download the ISO and prepare it for use] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index#upgrading_rhel_for_edge_systems[Upgrading {op-system-ostree} systems] diff --git a/microshift_running_apps/microshift-embedded-apps-on-rhel-edge.adoc b/microshift_running_apps/microshift-embedded-apps-on-rhel-edge.adoc index 94bea69bd5d3..b981bedbbbc5 100644 --- a/microshift_running_apps/microshift-embedded-apps-on-rhel-edge.adoc +++ b/microshift_running_apps/microshift-embedded-apps-on-rhel-edge.adoc @@ -41,11 +41,11 @@ If you have an application that includes more than a few files, you can embed th [id="additional-resources_microshift-embed-apps-on-rhel-edge_{context}"] [role="_additional-resources"] == Additional resources -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding {product-title} in an RPM-OSTree image] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding {product-title} in an RPM-OSTree image] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/{op-system-version-major}/html/composing_installing_and_managing_rhel_for_edge_images/index[Composing, installing, and managing {op-system-ostree} images] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#preparing-for-image-building_microshift-embed-in-rpm-ostree[Preparing for image building] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#preparing-for-image-building_microshift-embed-in-rpm-ostree[Preparing for image building] * link:https://cloud.redhat.com/blog/meet-red-hat-device-edge-with-microshift[Meet Red Hat Device Edge] diff --git a/microshift_running_apps/microshift-embedding-apps-tutorial.adoc b/microshift_running_apps/microshift-embedding-apps-tutorial.adoc index ec64e42bc7d3..4bb779926c54 100644 --- a/microshift_running_apps/microshift-embedding-apps-tutorial.adoc +++ b/microshift_running_apps/microshift-embedding-apps-tutorial.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="microshift-embedding-apps-tutorial"] -= Embedding {product-title} applications tutorial += Embedding {microshift-short} applications tutorial include::_attributes/attributes-microshift.adoc[] :context: microshift-embedding-apps-tutorial @@ -29,11 +29,11 @@ include::modules/microshift-adding-app-rpms-to-blueprint.adoc[leveloffset=+2] == Additional resources * xref:../microshift_running_apps/microshift-embed-apps-offline-use.adoc#microshift-embed-apps-offline-use[Embedding applications for offline use] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding {product-title} in an RPM-OSTree image] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding {product-title} in an RPM-OSTree image] * link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/{op-system-version-major}/html/composing_installing_and_managing_rhel_for_edge_images/index[Composing, installing, and managing {op-system-ostree} images] -* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#preparing-for-image-building_microshift-embed-in-rpm-ostree[Preparing for image building] +* xref:../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#preparing-for-image-building_microshift-embed-in-rpm-ostree[Preparing for image building] * link:https://cloud.redhat.com/blog/meet-red-hat-device-edge-with-microshift[Meet Red Hat Device Edge with {product-title}] diff --git a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc index 2ce9aa562df2..0ea06d98129a 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror-disconnected.adoc @@ -15,7 +15,7 @@ include::modules/microshift-olm-deploy-op-disconnected-con.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources * link:https://access.redhat.com/documentation/en-us/red_hat_build_of_microshift/{ocp-version}/html/installing/microshift-embed-in-rpm-ostree-for-offline-use#microshift-creating-ostree-iso_microshift-embed-rpm-ostree-offline-use[Creating the RHEL for Edge image] -* xref:../../microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use] +* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use] * xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-networking-disconnected-hosts[Configuring network settings for fully disconnected hosts] //OCP module, edit with conditionals and care diff --git a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc index 43d7f3c05c68..df3815cc3ba5 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-oc-mirror.adoc @@ -16,10 +16,10 @@ You can filter and prune catalogs to get specific Operators and mirror them by u [role="_additional-resources"] .Additional resources * link:https://access.redhat.com/documentation/en-us/openshift_container_platform/{ocp-version}/html/operators/administrator-tasks#olm-restricted-networks[Using Operator Lifecycle Manager on restricted networks] -* xref:../../microshift_install/microshift-deploy-with-mirror-registry.adoc#microshift-configuring-hosts-for-mirror_microshift-deployment-mirror[Configuring hosts for mirror registry access] +* xref:../../microshift_install_rpm_ostree/microshift-deploy-with-mirror-registry.adoc#microshift-configuring-hosts-for-mirror_microshift-deployment-mirror[Configuring hosts for mirror registry access] * xref:../../microshift_networking/microshift-disconnected-network-config.adoc#microshift-disconnected-network-config[Configuring network settings for fully disconnected hosts] -* xref:../../microshift_install/microshift-deploy-with-mirror-registry.adoc#microshift-get-mirror-reg-container-image-list_microshift-deploy-with-mirror-registry[Getting the mirror registry container image list] -* xref:../../microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-in-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use] +* xref:../../microshift_install_rpm_ostree/microshift-deploy-with-mirror-registry.adoc#microshift-get-mirror-reg-container-image-list_microshift-deploy-with-mirror-registry[Getting the mirror registry container image list] +* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc#microshift-embed-in-rpm-ostree-offline-use[Embedding in a {op-system-ostree} image for offline use] include::modules/microshift-oc-mirror-about-con.adoc[leveloffset=+1] diff --git a/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc b/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc index 1a788623a3e3..e42881846d74 100644 --- a/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc +++ b/microshift_running_apps/microshift_operators/microshift-operators-olm.adoc @@ -30,7 +30,7 @@ You can install the OLM package manager for use with {microshift-short} 4.15 or * You can install the `microshift-olm` RPM at the same time you install the {microshift-short} RPM on {op-system-base-full}. * You can install the `microshift-olm` on an existing {microshift-short} {product-version}. Restart the {microshift-short} service after installing OLM for the changes to apply. See xref:../../microshift_install/microshift-install-rpm.adoc#microshift-install-rpms-olm_microshift-install-rpm[Installing the Operator Lifecycle Manager (OLM) from an RPM package]. -* You can embed OLM in a {op-system-ostree-first} image. See xref:../../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-adding-olm-to-blueprint_microshift-embed-in-rpm-ostree[Adding the Operator Lifecycle Manager (OLM) service to a blueprint]. +* You can embed OLM in a {op-system-ostree-first} image. See xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-adding-olm-to-blueprint_microshift-embed-in-rpm-ostree[Adding the Operator Lifecycle Manager (OLM) service to a blueprint]. include::modules/microshift-olm-namespaces.adoc[leveloffset=+1] diff --git a/modules/microshift-accessing-cluster-locally.adoc b/modules/microshift-accessing-cluster-locally.adoc index 18240063db5e..91f3d9e5d298 100644 --- a/modules/microshift-accessing-cluster-locally.adoc +++ b/modules/microshift-accessing-cluster-locally.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// microshift/microshift_install/microshift-install-rpm.adoc -// microshift/microshift_install/microshift-embed-in-rpm-ostree.adoc -// microshift/microshift_configuring/microshift-cluster-access-kubeconfig.adoc +// microshift_install_rpm/microshift-install-rpm.adoc +// microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc +// microshift_configuring/microshift-cluster-access-kubeconfig.adoc :_mod-docs-content-type: PROCEDURE [id="accessing-microshift-cluster-locally_{context}"] diff --git a/modules/microshift-accessing-cluster-open-firewall.adoc b/modules/microshift-accessing-cluster-open-firewall.adoc index a444d69130ac..24f20068e8d5 100644 --- a/modules/microshift-accessing-cluster-open-firewall.adoc +++ b/modules/microshift-accessing-cluster-open-firewall.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// microshift/microshift_install/microshift-install-rpm.adoc -// microshift/microshift_install/microshift-embed-in-rpm-ostree.adoc -// microshift/microshift_configuring/microshift-cluster-access-kubeconfig.adoc +// microshift_install_rpm/microshift-install-rpm.adoc +// microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc +// microshift_configuring/microshift-cluster-access-kubeconfig.adoc :_mod-docs-content-type: PROCEDURE [id="microshift-accessing-cluster-open-firewall_{context}"] diff --git a/modules/microshift-accessing-cluster-remotely.adoc b/modules/microshift-accessing-cluster-remotely.adoc index 2b3f778e2356..1367965ce917 100644 --- a/modules/microshift-accessing-cluster-remotely.adoc +++ b/modules/microshift-accessing-cluster-remotely.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// microshift/microshift_install/microshift-install-rpm.adoc -// microshift/microshift_install/microshift-embed-in-rpm-ostree.adoc -// microshift/microshift_configuring/microshift-cluster-access-kubeconfig.adoc +// microshift_install_rpm/microshift-install-rpm.adoc +// microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc +// microshift_configuring/microshift-cluster-access-kubeconfig.adoc :_mod-docs-content-type: PROCEDURE [id="accessing-microshift-cluster-remotely_{context}"] diff --git a/modules/microshift-accessing.adoc b/modules/microshift-accessing.adoc index 1eee45bb86f1..6cb48d6bc401 100644 --- a/modules/microshift-accessing.adoc +++ b/modules/microshift-accessing.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// microshift/microshift_install/microshift-install-rpm.adoc -// microshift/microshift_install/microshift-embed-in-rpm-ostree.adoc +// microshift_install_rpm/microshift-install-rpm.adoc +// microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc :_mod-docs-content-type: CONCEPT [id="accessing-microshift-cluster_{context}"] diff --git a/modules/microshift-add-blueprint-build-iso.adoc b/modules/microshift-add-blueprint-build-iso.adoc index 2ac15e9c6c84..39254748f468 100644 --- a/modules/microshift-add-blueprint-build-iso.adoc +++ b/modules/microshift-add-blueprint-build-iso.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// microshift/microshift-embed-into-rpm-ostree.adoc +// microshift_install_rpm_ostree/microshift-embed-into-rpm-ostree.adoc :_mod-docs-content-type: PROCEDURE [id="microshift-add-blueprint-build-iso_{context}"] diff --git a/modules/microshift-adding-other-packages-to-blueprint.adoc b/modules/microshift-adding-other-packages-to-blueprint.adoc index afedf8b1a115..4406f9563b73 100644 --- a/modules/microshift-adding-other-packages-to-blueprint.adoc +++ b/modules/microshift-adding-other-packages-to-blueprint.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * microshift/microshift-update-rpms-ostree.adoc +// * microshift_install_rpm/microshift-update-rpms-ostree.adoc :_mod-docs-content-type: PROCEDURE [id="microshift-adding-other-services-to-blueprint_{context}"] diff --git a/modules/microshift-adding-repos-to-image-builder.adoc b/modules/microshift-adding-repos-to-image-builder.adoc index c782cdfa42bf..3783db78058c 100644 --- a/modules/microshift-adding-repos-to-image-builder.adoc +++ b/modules/microshift-adding-repos-to-image-builder.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * microshift/microshift-embed-into-rpm-ostree.adoc -// * microshift/microshift-update-rpms-ostree.adoc +// * microshift_install_rpm_ostree/microshift-embed-into-rpm-ostree.adoc +// * microshift_install_rpm/microshift-update-rpms-ostree.adoc :_mod-docs-content-type: PROCEDURE [id="adding-microshift-repos-image-builder_{context}"] diff --git a/modules/microshift-adding-service-to-blueprint.adoc b/modules/microshift-adding-service-to-blueprint.adoc index 852b622639fd..eab8eb260e87 100644 --- a/modules/microshift-adding-service-to-blueprint.adoc +++ b/modules/microshift-adding-service-to-blueprint.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * microshift/microshift-embed-into-rpm-ostree.adoc -// * microshift/microshift-update-rpms-ostree.adoc +// * microshift_install_rpm_ostree/microshift-embed-into-rpm-ostree.adoc +// * microshift_install_rpm/microshift-update-rpms-ostree.adoc :_mod-docs-content-type: PROCEDURE [id="adding-microshift-service-to-blueprint_{context}"] diff --git a/modules/microshift-ca-adding-bundle-ostree.adoc b/modules/microshift-ca-adding-bundle-ostree.adoc index 73474b2fb0b2..04d1dc8fc692 100644 --- a/modules/microshift-ca-adding-bundle-ostree.adoc +++ b/modules/microshift-ca-adding-bundle-ostree.adoc @@ -1,6 +1,6 @@ //Module included in the following assemblies: // -//* microshift_install/microshift-embed-in-rpm-ostree.adoc +//* microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/microshift-ca-adding-bundle.adoc b/modules/microshift-ca-adding-bundle.adoc index 42664dabbb64..459defdfc093 100644 --- a/modules/microshift-ca-adding-bundle.adoc +++ b/modules/microshift-ca-adding-bundle.adoc @@ -1,6 +1,6 @@ //Module included in the following assemblies: // -//* microshift_install/microshift-embed-in-rpm-ostree.adoc +//* microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc :_mod-docs-content-type: CONCEPT [id="microshift-ca-adding-bundle_{context}"] diff --git a/modules/microshift-embed-microshift-image-offline-deploy.adoc b/modules/microshift-embed-microshift-image-offline-deploy.adoc index e55ff92798f2..6dcc37a9849b 100644 --- a/modules/microshift-embed-microshift-image-offline-deploy.adoc +++ b/modules/microshift-embed-microshift-image-offline-deploy.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // // microshift_running_applications/embed-microshift-offline-deploy.adoc +// microshift_install_rpm_ostree/microshift-embed-rpm-ostree-offline-use.adoc :_mod-docs-content-type: PROCEDURE [id="microshift-embed-microshift-image-offline-deployment_{context}"] diff --git a/modules/microshift-oc-mirror-creating-imageset-config.adoc b/modules/microshift-oc-mirror-creating-imageset-config.adoc index d87688ee6d5b..c67591f76991 100644 --- a/modules/microshift-oc-mirror-creating-imageset-config.adoc +++ b/modules/microshift-oc-mirror-creating-imageset-config.adoc @@ -23,11 +23,13 @@ Do not delete or modify the metadata that is generated by the oc-mirror plugin. . Use the `oc mirror init` command to create a template for the image set configuration and save it to a file called `imageset-config.yaml`: + +-- [source,terminal] ---- $ oc mirror init <--registry > imageset-config.yaml <1> ---- <1> Specifies the location of your storage backend, such as `example.com/mirror/oc-mirror-metadata`. +-- + .Example default image set configuration file [source,yaml] @@ -55,7 +57,7 @@ mirror: ---- <1> The `platform` field and related fields are not supported by {microshift-short} and must be deleted. <2> Specify any additional images to include in the image set. If you do not need to specify additional images, delete this field. -<3> Helm is not supported by {microshift-short}, and must be deleted. +<3> Helm is not supported by {microshift-short} and must be deleted. . Edit the values of your image set configuration file to meet the requirements of both {microshift-short} and the Operator you want to mirror, like the following example: + diff --git a/modules/microshift-preparing-for-image-building.adoc b/modules/microshift-preparing-for-image-building.adoc index e5ba25b23d61..c8d18696062d 100644 --- a/modules/microshift-preparing-for-image-building.adoc +++ b/modules/microshift-preparing-for-image-building.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// microshift_install/microshift-embed-rpm-ostree.adoc +// microshift_install_rpm_ostree/microshift-embed-rpm-ostree.adoc :_mod-docs-content-type: CONCEPT [id="preparing-for-image-building_{context}"]