File 0019-medium-bootstrap-Fix-watchdog-SBD-envvars-bsc-104511.patch of Package crmsh
From a1700c3bc21f57b711874c3e502dc1bfbd8823d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Fri, 23 Jun 2017 07:55:13 +0200
Subject: [PATCH 19/19] medium: bootstrap: Fix watchdog SBD envvars
(bsc#1045118)
Fix issues reported in #204.
---
crmsh/bootstrap.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 0fbe0f90..79d9720e 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -941,11 +941,10 @@ def init_sbd_diskless():
else:
log("Creating {} with diskless configuration".format(SYSCONFIG_SBD))
utils.sysconfig_set(SYSCONFIG_SBD,
- SBD_WATCHDOG="yes",
SBD_PACEMAKER="yes",
SBD_STARTMODE="always",
SBD_DELAY_START="no",
- SBD_WATCHDOG_DEVICE=detect_watchdog_device())
+ SBD_WATCHDOG_DEV=detect_watchdog_device())
csync2_update(SYSCONFIG_SBD)
status_done()
@@ -1052,7 +1051,8 @@ rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3
if not invoke("crm configure property stonith-enabled=true"):
error("Can't enable STONITH for SBD")
elif _context.diskless_sbd:
- if not invoke("crm configure property stonith-enabled=true"):
+ # TODO: configure stonith-watchdog-timeout correctly
+ if not invoke("crm configure property stonith-enabled=true stonith-watchdog-timeout=5s"):
error("Can't enable STONITH for diskless SBD")
--
2.12.2