Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bca... Commit: bcac91aadf00a7c1c1d5855f2f3380943467041d Parent: a26a9856c295be1de37186299eb52034a1c9cd66 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Sun Dec 20 17:13:08 2009 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Sun Dec 20 17:13:08 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 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index e0b92fb..58a86c9 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -27,7 +27,7 @@ #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 823837b..52711d8 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -138,9 +138,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 settings and default values