Skip to content

Commit 9ffa32f

Browse files
committed
OSDOCS-11919: updates RPM install content MicroShift
1 parent 22b9653 commit 9ffa32f

File tree

13 files changed

+27
-36
lines changed

13 files changed

+27
-36
lines changed

_topic_maps/_topic_map_ms.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,6 @@ Topics:
3636
- Name: Red Hat build of MicroShift 4.17 release notes
3737
File: microshift-4-17-release-notes
3838
---
39-
Name: Installing
40-
Dir: microshift_install
41-
Distros: microshift
42-
Topics:
43-
- Name: Installing from an RPM package
44-
File: microshift-install-rpm
45-
- Name: Troubleshooting installation issues
46-
File: microshift-installing-troubleshooting
47-
---
48-
Name: Installing with RHEL image mode
49-
Dir: microshift_install_bootc
50-
Distros: microshift
51-
Topics:
52-
- Name: Installing with RHEL image mode
53-
File: microshift-install-rhel-image-mode
54-
---
5539
Name: Getting ready to install MicroShift
5640
Dir: microshift_install_get_ready
5741
Distros: microshift
@@ -63,6 +47,13 @@ Topics:
6347
- Name: Understanding system health checks
6448
File: microshift-greenboot
6549
---
50+
Name: Installing with RPMs
51+
Dir: microshift_install_rpm
52+
Distros: microshift
53+
Topics:
54+
- Name: Installing from an RPM package
55+
File: microshift-install-rpm
56+
---
6657
Name: Embedding in a RHEL for Edge image
6758
Dir: microshift_install_rpm_ostree
6859
Distros: microshift
@@ -74,6 +65,13 @@ Topics:
7465
- Name: Embedding in a RHEL for Edge image for offline use
7566
File: microshift-embed-in-rpm-ostree-offline-use
7667
---
68+
Name: Installing with RHEL image mode
69+
Dir: microshift_install_bootc
70+
Distros: microshift
71+
Topics:
72+
- Name: Installing with RHEL image mode
73+
File: microshift-install-rhel-image-mode
74+
---
7775
Name: Updating
7876
Dir: microshift_updating
7977
Distros: microshift
@@ -522,6 +520,8 @@ Topics:
522520
File: microshift-version
523521
- Name: Troubleshoot the cluster
524522
File: microshift-troubleshoot-cluster
523+
- Name: Troubleshoot installation issues
524+
File: microshift-installing-troubleshooting
525525
- Name: Troubleshoot backup and restore
526526
File: microshift-troubleshoot-backup-restore
527527
- Name: Troubleshoot updates

microshift_backup_and_restore/microshift-backup-and-restore.adoc

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ include::modules/microshift-backing-up-manually.adoc[leveloffset=+1]
2424
//additional resources for backing-up module
2525
[role="_additional-resources"]
2626
.Additional resources
27-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
28-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
27+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
28+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
2929
3030
include::modules/microshift-restoring-data-backups.adoc[leveloffset=+1]
3131

@@ -34,5 +34,5 @@ include::modules/microshift-restoring-data-backups.adoc[leveloffset=+1]
3434
//additional resources for restoring-data module
3535
[role="_additional-resources"]
3636
.Additional resources
37-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
38-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
37+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
38+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
File renamed without changes.
File renamed without changes.

microshift_install/microshift-install-rpm.adoc renamed to microshift_install_rpm/microshift-install-rpm.adoc

-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ toc::[]
88

99
You can install {microshift-short} from an RPM package on a machine with a supported version of {op-system-base-full}.
1010

11-
include::modules/microshift-install-system-requirements.adoc[leveloffset=+1]
12-
13-
[id="microshift-install-rpm-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-install-rpm-before.adoc[leveloffset=+1]
2112

2213
//additional resources for install rpm before module
File renamed without changes.
File renamed without changes.

microshift_install_rpm_ostree/microshift-embed-in-rpm-ostree.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ include::modules/microshift-provisioning-ostree.adoc[leveloffset=+1]
5353
.Additional resources
5454

5555
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index[{op-system-ostree} documentation]
56-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-install-system-requirements_microshift-install-rpm[System requirements for installing MicroShift]
56+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-install-system-requirements_microshift-install-rpm[System requirements for installing MicroShift]
5757
* link:https://console.redhat.com/openshift/install/pull-secret[Red Hat Hybrid Cloud Console pull secret]
5858
* xref:../microshift_networking/microshift-firewall.adoc#microshift-firewall-req-settings_microshift-firewall[Required firewall settings]
5959
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/performing_an_advanced_rhel_9_installation/creating-kickstart-files_installing-rhel-as-an-experienced-user[Creating a Kickstart file]

microshift_running_apps/microshift-gitops.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/microshift-gitops-adding-apps.adoc[leveloffset=+1]
2323

2424
[role="_additional-resources"]
2525
.Additional resources
26-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-installing-rpms-for-gitops_microshift-install-rpm[Installing the GitOps Argo CD manifests from an RPM package]
26+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-installing-rpms-for-gitops_microshift-install-rpm[Installing the GitOps Argo CD manifests from an RPM package]
2727

2828
[id="microshift-gitops-cannot-do_{context}"]
2929
== Limitations of using the GitOps agent with {microshift-short}
@@ -43,7 +43,7 @@ include::modules/microshift-gitops-debug.adoc[leveloffset=+2]
4343
[id="additional-resources_microshift-gitops_{context}"]
4444
[role="_additional-resources"]
4545
== Additional resources
46-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-installing-rpms-for-gitops_microshift-install-rpm[Installing the GitOps Argo CD manifests from an RPM package]
46+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-installing-rpms-for-gitops_microshift-install-rpm[Installing the GitOps Argo CD manifests from an RPM package]
4747

4848
* xref:../microshift_support/microshift-sos-report.adoc#microshift-sos-report[Using sos reports]
4949

microshift_running_apps/microshift_operators/microshift-operators-olm.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ You can install the OLM package manager for use with {microshift-short} 4.15 or
2929

3030
* You can install the `microshift-olm` RPM at the same time you install the {microshift-short} RPM on {op-system-base-full}.
3131
* 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.
32-
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].
32+
See xref:../../microshift_install_rpm/microshift-install-rpm.adoc#microshift-install-rpms-olm_microshift-install-rpm[Installing the Operator Lifecycle Manager (OLM) from an RPM package].
3333
* 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].
3434

3535
include::modules/microshift-olm-namespaces.adoc[leveloffset=+1]

microshift_troubleshooting/microshift-troubleshoot-updates.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ include::modules/microshift-updates-troubleshooting.adoc[leveloffset=+1]
2020
.Additional resources
2121
* xref:../microshift_install_get_ready/microshift-greenboot.adoc#microshift-greenboot-systemd-journal-data_microshift-greenboot[Enabling `systemd` journal service data persistency]
2222
* xref:../microshift_troubleshooting/microshift-version.adoc#microshift-version[Checking the MicroShift version]
23-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
24-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
23+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-stopping_microshift-install-rpm[Stopping the MicroShift service]
24+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-service-starting_microshift-install-rpm[Starting the MicroShift service]
2525
* link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/composing_installing_and_managing_rhel_for_edge_images/index[Composing, installing, and managing RHEL for Edge images]
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#rolling_back_rhel_for_edge_images[Rolling back RHEL for Edge images]
2727

microshift_welcome/index.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To get started with {microshift-short}, use the following links:
2222

2323
//text is in main assembly for the sake of cross references
2424
* xref:../microshift_release_notes/microshift-4-17-release-notes.adoc#microshift-4-17-release-notes[{product-title} release notes]
25-
* xref:../microshift_install/microshift-install-rpm.adoc#microshift-install-rpm[Installing {product-title}]
25+
* xref:../microshift_install_rpm/microshift-install-rpm.adoc#microshift-install-rpm[Installing {product-title}]
2626

2727
For related information, use the following links:
2828

0 commit comments

Comments
 (0)