OCPBUGS#14422: move greenboot setup to install

openshift · Jun 26, 2023 · 46ea540 · 46ea540
1 parent ffeac99
commit 46ea540
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/_topic_maps/_topic_map_ms.yml b/_topic_maps/_topic_map_ms.yml
@@ -55,6 +55,8 @@ Topics:
   File: microshift-install-rpm
 - Name: Embedding in a RHEL for Edge image
   File: microshift-embed-in-rpm-ostree
+- Name: Greenboot health check
+  File: microshift-greenboot
 ---
 Name: Support
 Dir: microshift_support
@@ -144,8 +146,6 @@ Topics:
   File: microshift-applications
 - Name: Operators
   File: microshift-operators
-- Name: Greenboot health check
-  File: microshift-greenboot
 ---
 Name: Troubleshooting
 Dir: microshift_troubleshooting

diff --git a/...ft_running_apps/microshift-greenboot.adoc → microshift_install/microshift-greenboot.adoc b/...ft_running_apps/microshift-greenboot.adoc → microshift_install/microshift-greenboot.adoc
@@ -16,20 +16,29 @@ A {product-title} health check script is included in the `microshift-greenboot`
 
 [NOTE]
 ====
-Health check scripts might run on a system not using an OSTree file system, but no rollback is possible in the case of an update failure.
+Rollback is not possible in the case of an update failure on a system not using OSTree. This is true even though health checks might run.
 ====
 
 include::modules/microshift-greenboot-dir-structure.adoc[leveloffset=+1]
+
 include::modules/microshift-greenboot-microshift-health-script.adoc[leveloffset=+1]
+
 include::modules/microshift-greenboot-systemd-journal-data.adoc[leveloffset=+1]
-//include::modules/microshift-greenboot-create-health-check-script.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
 * xref:../microshift_running_apps/microshift-applications.adoc#microshift-manifests-example_applications-microshift[Auto applying manifests]
 
 include::modules/microshift-greenboot-updates-workloads.adoc[leveloffset=+1]
+
 include::modules/microshift-greenboot-workloads-validation.adoc[leveloffset=+1]
+
 include::modules/microshift-greenboot-health-check-log.adoc[leveloffset=+1]
+
 include::modules/microshift-greenboot-prerollback-log.adoc[leveloffset=+1]
-include::modules/microshift-greenboot-check-update.adoc[leveloffset=+1]
+
+include::modules/microshift-greenboot-check-update.adoc[leveloffset=+1]
+
+//[role="_additional-resources_microshift-greenboot"]
+//.Additional resources
+//once the greenboot application health check is merged, an assembly-level xref can go here