Skip to content

Commit 22b9653

Browse files
ShaunaDiazShaunaDiaz
authored
Merge pull request #81451 from ShaunaDiaz/OSDOCS-11918
OSDOCS-11918: creates rpm ostree install title MicroShift
2 parents 452be95 + 185a413 commit 22b9653

28 files changed

+56
-64
lines changed

‎_topic_maps/_topic_map_ms.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ Distros: microshift
4242
Topics:
4343
- Name: Installing from an RPM package
4444
File: microshift-install-rpm
45-
- Name: Mirroring container images for disconnected installations
46-
File: microshift-deploy-with-mirror-registry
47-
- Name: Embedding in a RHEL for Edge image
48-
File: microshift-embed-in-rpm-ostree
49-
- Name: Embedding in a RHEL for Edge image for offline use
50-
File: microshift-embed-in-rpm-ostree-offline-use
5145
- Name: Troubleshooting installation issues
5246
File: microshift-installing-troubleshooting
5347
---
@@ -69,6 +63,17 @@ Topics:
6963
- Name: Understanding system health checks
7064
File: microshift-greenboot
7165
---
66+
Name: Embedding in a RHEL for Edge image
67+
Dir: microshift_install_rpm_ostree
68+
Distros: microshift
69+
Topics:
70+
- Name: Embedding in a RHEL for Edge image using image builder
71+
File: microshift-embed-in-rpm-ostree
72+
- Name: Mirroring container images for disconnected installations
73+
File: microshift-deploy-with-mirror-registry
74+
- Name: Embedding in a RHEL for Edge image for offline use
75+
File: microshift-embed-in-rpm-ostree-offline-use
76+
---
7277
Name: Updating
7378
Dir: microshift_updating
7479
Distros: microshift

‎microshift_configuring/microshift_low_latency/microshift-low-latency.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ include::modules/microshift-low-latency-install-kernelrt-rhel-edge.adoc[leveloff
6161

6262
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:
6363

64-
* 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]
64+
* 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]
6565

6666
//additional resources for real-time kernel
6767
[role="_additional-resources"]
@@ -71,7 +71,7 @@ Complete the build process by starting with the following procedure to embed {mi
7171
* link:https://osbuild.org/docs/on-premises/installation/managing-repositories/#using-repositories-that-require-subscription[Using repositories that require subscription] (osbuild documentation)
7272
* 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.
7373
* 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)
74-
* xref:../../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image]
74+
* xref:../../microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc#microshift-embed-in-rpm-ostree[Embedding in a {op-system-ostree} image]
7575

7676
* link:https://access.redhat.com/solutions/4096521[FAQ about RHEL for Real Time (kernel-rt)]
7777
//Can likely remove KCS after 2024 as it may go out of date

‎microshift_install_rpm_ostree/_attributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../_attributes/

‎microshift_install_rpm_ostree/images

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../images/

‎microshift_install/microshift-deploy-with-mirror-registry.adoc renamed to ‎microshift_install_rpm_ostree/microshift-deploy-with-mirror-registry.adoc

File renamed without changes.

‎microshift_install/microshift-embed-in-rpm-ostree-offline-use.adoc renamed to ‎microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree-offline-use.adoc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ toc::[]
88

99
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.
1010

11-
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
12-
13-
[id="embed-offline-rhde-compatibility-table"]
14-
== Compatibility table
15-
16-
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:
17-
18-
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
19-
2011
include::modules/microshift-embed-microshift-image-offline-deploy.adoc[leveloffset=+1]
2112

2213
include::modules/microshift-embed-microshift-update-osbuilder-worker.adoc[leveloffset=+1]

‎microshift_install/microshift-embed-in-rpm-ostree.adoc renamed to ‎microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="microshift-embed-in-rpm-ostree"]
3-
= Embedding in a {op-system-ostree} image
3+
= Embedding in a {op-system-ostree} image using image builder
44
include::_attributes/attributes-microshift.adoc[]
55
:context: microshift-embed-in-rpm-ostree
66

77
toc::[]
88

99
You can embed {microshift-short} into a {op-system-ostree-first} image. Use this guide to build a {op-system} image containing {microshift-short}.
1010

11-
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
12-
13-
Plan to use a supported version of {op-system} paired with your version of {microshift-short} as described in the following table.
14-
15-
[id="embed-ostree-rhde-compatibility-table"]
16-
== Compatibility table
17-
18-
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:
19-
20-
include::snippets/microshift-rhde-compatibility-table-snip.adoc[leveloffset=+1]
21-
2211
include::modules/microshift-preparing-for-image-building.adoc[leveloffset=+1]
2312

2413
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]
4635

4736
[role="_additional-resources"]
4837
.Additional resources
49-
* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image]
38+
* 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]
5039
* 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)]
5140
* 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)]
5241
* 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]

‎microshift_install_rpm_ostree/modules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../modules/

‎microshift_install_rpm_ostree/snippets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../snippets/

‎microshift_running_apps/microshift-embed-apps-offline-use.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ include::modules/microshift-embed-images-offline-use.adoc[leveloffset=+1]
1717

1818
* 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]
1919

20-
* xref:../microshift_install/microshift-embed-in-rpm-ostree.adoc#microshift-creating-ostree-iso_microshift-embed-in-rpm-ostree[Creating the {op-system-ostree} image]
20+
* 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]
2121

22-
* 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]
22+
* 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]
2323

24-
* 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]
24+
* 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]
2525

2626
* 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]

0 commit comments

Comments
 (0)