Merging upstream version 2.1.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/fencing/st_rhcs.c b/lib/fencing/st_rhcs.c
index ec80793..854d333 100644
--- a/lib/fencing/st_rhcs.c
+++ b/lib/fencing/st_rhcs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the Pacemaker project contributors
+ * Copyright 2004-2023 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -180,14 +180,17 @@ stonith__rhcs_get_metadata(const char *agent, int timeout_sec,
     xpathObj = xpath_search(xml, "//action[@name='stop']");
     if (numXpathResults(xpathObj) <= 0) {
         xmlNode *tmp = NULL;
+        const char *timeout_str = NULL;
+
+        timeout_str = pcmk__readable_interval(PCMK_DEFAULT_ACTION_TIMEOUT_MS);
 
         tmp = create_xml_node(actions, "action");
-        crm_xml_add(tmp, "name", "stop");
-        crm_xml_add(tmp, "timeout", CRM_DEFAULT_OP_TIMEOUT_S);
+        crm_xml_add(tmp, "name", PCMK_ACTION_STOP);
+        crm_xml_add(tmp, "timeout", timeout_str);
 
         tmp = create_xml_node(actions, "action");
-        crm_xml_add(tmp, "name", "start");
-        crm_xml_add(tmp, "timeout", CRM_DEFAULT_OP_TIMEOUT_S);
+        crm_xml_add(tmp, "name", PCMK_ACTION_START);
+        crm_xml_add(tmp, "timeout", timeout_str);
     }
     freeXpathObject(xpathObj);
 
@@ -292,7 +295,7 @@ stonith__rhcs_validate(stonith_t *st, int call_options, const char *target,
         host_arg = NULL;
     }
 
-    action = stonith__action_create(agent, "validate-all", target, 0,
+    action = stonith__action_create(agent, PCMK_ACTION_VALIDATE_ALL, target, 0,
                                     remaining_timeout, params, NULL, host_arg);
 
     rc = stonith__execute(action);