cluster: RHEL56 - fencing: Not all parameters appear in metadata
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 773287f0f3952b33d585a1f13114636ce7ff0488
Parent: c6873545f430825a0f211dd595a2248f24ab88c1
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Jul 28 15:18:37 2010 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Aug 2 11:10:11 2010 +0200
fencing: Not all parameters appear in metadata
Resolves: rhbz#619034
---
fence/agents/lib/fencing.py.py | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 585baa1..e44632b 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -329,35 +329,47 @@ all_opt = {
"longopt" : "login-timeout",
"help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login",
"default" : "5",
+ "required" : "0",
+ "shortdesc" : "Wait X seconds for cmd prompt after login",
"order" : 200 },
"shell_timeout" : {
"getopt" : "Y:",
"longopt" : "shell-timeout",
"help" : "--shell-timeout <seconds> Wait X seconds for cmd prompt after issuing command",
"default" : "3",
+ "required" : "0",
+ "shortdesc" : "Wait X seconds for cmd promprt after issuing command",
"order" : 200 },
"power_timeout" : {
"getopt" : "g:",
"longopt" : "power-timeout",
"help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF",
"default" : "20",
+ "required" : "0",
+ "shortdesc" : "Test X seconds for status change after ON/OFF",
"order" : 200 },
"power_wait" : {
"getopt" : "G:",
"longopt" : "power-wait",
"help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF",
"default" : "0",
+ "required" : "0",
+ "shortdesc" : "Wait X seconds after issuing ON/OFF",
"order" : 200 },
"missing_as_off" : {
"getopt" : "M",
"longopt" : "missing-as-off",
"help" : "--missing-as-off Missing port returns OFF instead of failure",
+ "required" : "0",
+ "shortdesc" : "Missing port returns OFF instead of failure",
"order" : 200 },
"retry_on" : {
"getopt" : "F:",
"longopt" : "retry-on",
"help" : "--retry-on <attempts> Count of attempts to retry power on",
"default" : "1",
+ "required" : "0",
+ "shortdesc" : "Count of attempts to retry power on",
"order" : 200 }
}
13 years, 9 months
cluster: STABLE3 - fence_drac5: make "port" a synonym of "module_name" for drac5
by Marek Grác
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: a598fada75f0e138b715b5da11d33b3040a2c903
Parent: db1a93f32b36da95a19716ed1b6832b04f4c68dd
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Fri Jul 30 17:58:01 2010 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Aug 2 11:05:58 2010 +0200
fence_drac5: make "port" a synonym of "module_name" for drac5
Resolves: rhbz#619096
---
fence/agents/lib/fencing.py.py | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 84794dd..3289eb5 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -513,6 +513,11 @@ def process_input(avail_opt):
else:
longopt_list.append(all_opt[k]["longopt"])
+ ## Compatibility layer
+ if avail_opt.count("module_name") == 1:
+ getopt_string += "n:"
+ longopt_list.append("plug=")
+
##
## Read options from command line or standard input
#####
@@ -539,6 +544,8 @@ def process_input(avail_opt):
z = dict(opt)
if z.has_key("-T") == 1:
z["-o"] = "status"
+ if z.has_key("-n") == 1:
+ z["-m"] = z["-n"]
opt = z
##
@@ -568,6 +575,8 @@ def process_input(avail_opt):
name = "module_name"
elif name == "action" and 1 == avail_opt.count("io_fencing"):
name = "io_fencing"
+ elif name == "port" and 1 == avail_opt.count("drac_version"):
+ name = "module_name"
##
######
13 years, 9 months