From 61ad8d12650a2767280d2d1ac4a0cab156fa3a9d Mon Sep 17 00:00:00 2001
From: Tahlia Richardson <3069029+tahliar@users.noreply.github.com>
Date: Fri, 9 Aug 2024 13:47:40 +1000
Subject: [PATCH] Add command to exit standby mode after reboot

bsc#1228983
jsc#DOCTEAM-1534
---
 xml/ha_maintenance.xml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/xml/ha_maintenance.xml b/xml/ha_maintenance.xml
index 7bbdc1b5..cb6331aa 100644
--- a/xml/ha_maintenance.xml
+++ b/xml/ha_maintenance.xml
@@ -413,8 +413,10 @@
 <sect1 xml:id="sec-ha-maint-shutdown-node">
  <title>Stopping the cluster services on a node</title>
  <para>
-  To move the services off the node in an orderly fashion
-  before shutting down or rebooting the node, proceed as follows:
+  You can move the services off the node in an orderly fashion
+  before shutting down or rebooting the node.
+  This allows services to migrate off the node without being limited by the
+  shutdown timeout of the cluster services.
  </para>
  <procedure xml:id="pro-ha-maint-shutdown-node">
   <title>Manually rebooting a cluster node</title>
@@ -428,10 +430,11 @@
    <para>
     Put the node into <literal>standby</literal> mode:
    </para>
-<screen>&prompt.root;<command>crm -w node standby</command></screen>
+<screen>&prompt.root;<command>crm node standby</command></screen>
    <para>
-    That way, services can migrate off the node without being limited by the
-    shutdown timeout of the cluster services.
+    By default, the node will remain in <literal>standby</literal> mode
+    after rebooting. Alternatively, you can set the node to come back online
+    automatically with <command>crm node standby reboot</command>.
    </para>
   </step>
   <step>
@@ -466,7 +469,7 @@ Node <replaceable>&node2;</replaceable>: standby
  <procedure>
   <step>
    <para>
-    Log in to the node as &rootuser; or equivalent.
+    After the node reboots, log in to it again.
    </para>
   </step>
   <step>
@@ -475,7 +478,8 @@ Node <replaceable>&node2;</replaceable>: standby
    </para>
 <screen>&prompt.root;<command>crm cluster status</command></screen>
    <para>
-    If not, start them:
+     This might take some time. If the cluster services do not start again on their own,
+     start them manually:
    </para>
 <screen>&prompt.root;<command>crm cluster start</command></screen>
   </step>
@@ -484,9 +488,12 @@ Node <replaceable>&node2;</replaceable>: standby
     Check the cluster status:
    </para>
 <screen>&prompt.root;<command>crm status</command></screen>
-   <para>
-    It should show the node coming online again.
-   </para>
+  </step>
+  <step>
+    <para>
+      If the node is still in <literal>standby</literal> mode, bring it back online:
+    </para>
+<screen>&prompt.root;<command>crm node online</command></screen>
   </step>
  </procedure>
 </sect1>