cluster: RHEL55 - fencing: Change default timeout values for LPAR and IPMI
Marek Grác
marx at fedoraproject.org
Sun Dec 20 16:17:27 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e854270ef11f94db8ff481b7de896bdcc029beb4
Commit: e854270ef11f94db8ff481b7de896bdcc029beb4
Parent: 5cf593269f8731855274a2fb593e07b0f2ede20d
Author: Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate: Sun Dec 20 17:15:55 2009 +0100
Committer: Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Sun Dec 20 17:15:55 2009 +0100
fencing: Change default timeout values for LPAR and IPMI
Resolves: rhbz#549124, rhbz#546340
---
fence/agents/ipmilan/ipmilan.c | 2 +-
fence/agents/lpar/fence_lpar.py | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c
index ee6ae82..d8d76ff 100644
--- a/fence/agents/ipmilan/ipmilan.c
+++ b/fence/agents/ipmilan/ipmilan.c
@@ -53,7 +53,7 @@ do { \
#define ST_GENERIC_RESET 3
#define ST_CYCLE 4
-#define DEFAULT_TIMEOUT 10
+#define DEFAULT_TIMEOUT 20
#define DEFAULT_METHOD "onoff"
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index cfb78b0..3a22edc 100755
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -139,9 +139,10 @@ def main():
atexit.register(atexit_handler)
- pinput = process_input(device_opt)
- pinput["-x"] = 1
- options = check_input(device_opt, pinput)
+ all_opt["login_timeout"]["default"] = 15
+ all_opt["secure"]["default"] = 1
+
+ options = check_input(device_opt, process_input(device_opt))
##
## Fence agent specific defaults
@@ -152,9 +153,6 @@ def main():
if 0 == options.has_key("-H"):
options["-H"] = "4"
- if 0 == options.has_key("-x"):
- fail_usage("Failed: You have to use ssh connection (-x) to fence device")
-
show_docs(options)
if 0 == options.has_key("-s"):
More information about the cluster-commits
mailing list