Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=52a... Commit: 52a605b85acd70177c8592483e232dde5645f1db Parent: f6369316fa0c27cb68defc4e6d187f45dd86b5da Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Oct 19 23:19:06 2009 +0200 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Tue Oct 20 05:34:34 2009 +0200
fencing: short description of fence agent added
--- fence/agents/alom/fence_alom.py | 5 ++++- fence/agents/apc/fence_apc.py | 5 ++++- fence/agents/apc_snmp/fence_apc_snmp.py | 5 ++++- fence/agents/bladecenter/fence_bladecenter.py | 5 ++++- fence/agents/cisco_mds/fence_cisco_mds.py | 5 ++++- fence/agents/drac5/fence_drac5.py | 5 ++++- fence/agents/eps/fence_eps.py | 5 ++++- fence/agents/ibmblade/fence_ibmblade.py | 5 ++++- fence/agents/ifmib/fence_ifmib.py | 5 ++++- fence/agents/ilo/fence_ilo.py | 5 ++++- fence/agents/ilo_mp/fence_ilo_mp.py | 5 ++++- fence/agents/intelmodular/fence_intelmodular.py | 5 ++++- fence/agents/ipmilan/ipmilan.c | 2 +- fence/agents/ldom/fence_ldom.py | 5 ++++- fence/agents/lpar/fence_lpar.py | 5 ++++- fence/agents/rsa/fence_rsa.py | 5 ++++- fence/agents/virsh/fence_virsh.py | 5 ++++- fence/agents/vmware/fence_vmware.py | 5 ++++- fence/agents/wti/fence_wti.py | 5 ++++- fence/agents/xvm/options.c | 2 +- 20 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 8793e92..cb057b7 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -60,7 +60,10 @@ def main():
options["telnet_over_ssh"] = 1 - show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for Sun ALOM" + docs["longdesc"] = "" + show_docs(options, docs) # Operate the fencing device conn = fence_login(options) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 92b109c..71ed70c 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -200,7 +200,10 @@ def main(): if 0 == options.has_key("-c"): options["-c"] = "\n>"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for APC over telnet/ssh" + docs["longdesc"] = "" + show_docs(options, docs)
## Support for -n [switch]:[plug] notation that was used before if (options.has_key("-n") == 1) and (-1 != options["-n"].find(":")): diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 0c36b66..5054fae 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -189,7 +189,10 @@ def main(): if (not (options.has_key("-s"))): options["-s"]="1"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for APC over SNMP" + docs["longdesc"] = "" + show_docs(options, docs)
# Operate the fencing device result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 414c260..0590f57 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -104,7 +104,10 @@ def main():
options = check_input(device_opt, process_input(device_opt))
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for IBM BladeCenter" + docs["longdesc"] = "" + show_docs(options, docs) ## ## Operate the fencing device diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index bd8d858..68be9eb 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -107,7 +107,10 @@ def main():
options = check_input(device_opt, options)
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for Cisco MDS" + docs["longdesc"] = "" + show_docs(options, docs)
if (not (options["-o"] in ["list","monitor"])): port_oid=cisco_port2oid(options["-n"]) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index ab5056b..3f161ab 100755 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -97,7 +97,10 @@ def main(): if 0 == options.has_key("-c"): options["-c"] = "$"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for Dell DRAC CMC/5" + docs["longdesc"] = "" + show_docs(options, docs)
## ## Operate the fencing device diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index d9118a7..c9ead36 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -107,7 +107,10 @@ def main(): if (not options.has_key("-c")): options["-c"]="hidden.htm"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for ePowerSwitch" + docs["longdesc"] = "" + show_docs(options, docs)
#Run fence action. Conn is None, beacause we always need open new http connection result = fence_action(None, options, set_power_status, get_power_status,get_power_status) diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 4548a29..c1c75ec 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -71,7 +71,10 @@ def main():
options=check_input(device_opt,process_input(device_opt))
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for IBM BladeCenter over SNMP" + docs["longdesc"] = "" + show_docs(options, docs)
# Operate the fencing device result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 159554e..44ff927 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -128,7 +128,10 @@ def main():
options = check_input(device_opt, options)
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for IF MIB" + docs["longdesc"] = "" + show_docs(options, docs)
# Operate the fencing device result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 9905e2b..32a6edf 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -68,7 +68,10 @@ def main(): LOGIN_TIMEOUT = 10
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for HP iLO" + docs["longdesc"] = "" + show_docs(options, docs)
## ## Login and get version number diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index dc9a878..83aec1d 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -41,7 +41,10 @@ def main(): if 0 == options.has_key("-c"): options["-c"] = "MP>" - show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for HP iLO MP" + docs["longdesc"] = "" + show_docs(options, docs) conn = fence_login(options) conn.send("SMCLP\n") diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index c943c1e..c3f9252 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -77,7 +77,10 @@ def main():
options=check_input(device_opt,process_input(device_opt))
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for Intel Modular" + docs["longdesc"] = "" + show_docs(options, docs)
# Operate the fencing device result = fence_action(FencingSnmp(options), options, set_power_status, get_power_status, get_outlets_status) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index b1a7149..d980c87 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -825,7 +825,7 @@ static void print_xml_metadata(char *pname) { int i;
printf("%s\n","<?xml version=\"1.0\" ?>"); - printf("%s%s%s\n","<resource-agent name="",pname,"" shortdesc="">"); + printf("%s%s%s\n","<resource-agent name="",pname,"" shortdesc="Fence agent for IPMI over LAN">"); printf("<longdesc>\n"); printf("</longdesc>\n"); printf("%s\n","<parameters>"); diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 94d1429..ac2bfea 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -99,7 +99,10 @@ def main(): if (not options.has_key("-c")): options["-c"] = "\ $" - show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for Sun LDOM" + docs["longdesc"] = "" + show_docs(options, docs)
## ## Operate the fencing device diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 06498dc..823837b 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -148,7 +148,10 @@ def main(): if 0 == options.has_key("-c"): options["-c"] = [ ":~>", "]$", "$ " ]
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for IBM LPAR" + docs["longdesc"] = "" + show_docs(options, docs)
if 0 == options.has_key("-s"): fail_usage("Failed: You have to enter name of managed system") diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 347e1f5..da8646b 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -57,7 +57,10 @@ def main(): # This device will not allow us to login even with LANG=C options["ssh_options"] = "-F /dev/null"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for IBM RSA" + docs["longdesc"] = "" + show_docs(options, docs) ## ## Operate the fencing device diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 7d883dd..8508c17 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -78,7 +78,10 @@ def main():
options["ssh_options"]="-t '/bin/bash -c "PS1=[EXPECT]#\ /bin/bash --noprofile --norc"'"
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for virsh" + docs["longdesc"] = "" + show_docs(options, docs)
## Operate the fencing device conn = fence_login(options) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index b7a8eeb..b435632 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -299,7 +299,10 @@ def main(): # Default is secure connection options["-x"] = 1
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for VMWare" + docs["longdesc"] = "" + show_docs(options, docs)
# Check vmware type and set path vmware_check_vmware_type(options) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index f5eb169..eac79a3 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -89,7 +89,10 @@ def main(): if 0 == options.has_key("-c"): options["-c"] = [ "RSM>", "MPC>", "IPS>", "TPS>", "NBB>", "NPS>" ]
- show_docs(options) + docs = { } + docs["shortdesc"] = "Fence agent for WTI" + docs["longdesc"] = "" + show_docs(options, docs) ## ## Operate the fencing device diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 6fdc3d2..612ecf0 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -562,7 +562,7 @@ args_metadata(char *progname, const char *optstr) struct arg_info *arg;
printf("<?xml version=\"1.0\" ?>\n"); - printf("<resource-agent name="%s" >\n", basename(progname)); + printf("<resource-agent name="%s" shortdesc="Fence agent for virtual machines">\n", basename(progname)); printf("<parameters>\n");
for (x = 0; x < strlen(optstr); x++) {
cluster-commits@lists.stg.fedorahosted.org