From 46ea540feca145060bb590f08ca119aee048da4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CShauna=20Diaz=E2=80=9D?= Date: Fri, 23 Jun 2023 13:18:56 -0400 Subject: [PATCH] OCPBUGS#14422: move greenboot setup to install OCPBUGS#14422: move greenboot setup to install --- _topic_maps/_topic_map_ms.yml | 4 ++-- .../microshift-greenboot.adoc | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) rename {microshift_running_apps => microshift_install}/microshift-greenboot.adoc (87%) diff --git a/_topic_maps/_topic_map_ms.yml b/_topic_maps/_topic_map_ms.yml index e4293c88d6..2b82eca9b8 100644 --- 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/microshift_running_apps/microshift-greenboot.adoc b/microshift_install/microshift-greenboot.adoc similarity index 87% rename from microshift_running_apps/microshift-greenboot.adoc rename to microshift_install/microshift-greenboot.adoc index 86f95e2b4e..58070df511 100644 --- a/microshift_running_apps/microshift-greenboot.adoc +++ b/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] \ No newline at end of file + +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 \ No newline at end of file