Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=79a412372... Commit: 79a412372c3ef67077d55908d5873a94f5a4a0e5 Parent: fdb96874c75600864048a752c08aa1e45d2cc534 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon May 21 10:16:02 2012 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Thu Oct 4 10:41:25 2012 +0200
fence agents: Fix unique attribute for agents which are not based on fencing library
Resolves: rhbz#822507 --- fence/agents/brocade/fence_brocade.pl | 14 +++++++------- fence/agents/drac/fence_drac.pl | 22 +++++++++++----------- fence/agents/egenera/fence_egenera.pl | 14 +++++++------- fence/agents/kdump/fence_kdump.c | 16 ++++++++-------- fence/agents/scsi/fence_scsi.pl | 12 ++++++------ 5 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl index c820779..e3d1612 100644 --- a/fence/agents/brocade/fence_brocade.pl +++ b/fence/agents/brocade/fence_brocade.pl @@ -84,37 +84,37 @@ After a fence operation has taken place the fenced machine can no longer connec </longdesc> <vendor-url>http://www.brocade.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="disable" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="ipaddr" unique="1" required="1"> + <parameter name="ipaddr" unique="0" required="1"> <getopt mixed="-a <ip>" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> - <parameter name="login" unique="1" required="1"> + <parameter name="login" unique="0" required="1"> <getopt mixed="-l <name>" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="passwd" unique="1" required="0"> + <parameter name="passwd" unique="0" required="0"> <getopt mixed="-p <password>" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="1" required="0"> + <parameter name="passwd_script" unique="0" required="0"> <getopt mixed="-S <script>" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="1" required="1"> + <parameter name="port" unique="0" required="1"> <getopt mixed="-n <id>" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index 5e1b966..825391f 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -143,57 +143,57 @@ fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access </longdesc> <vendor-url>http://www.dell.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="ipaddr" unique="1" required="1"> + <parameter name="ipaddr" unique="0" required="1"> <getopt mixed="-a <ip>" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> - <parameter name="login" unique="1" required="1"> + <parameter name="login" unique="0" required="1"> <getopt mixed="-l <name>" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="passwd" unique="1" required="0"> + <parameter name="passwd" unique="0" required="0"> <getopt mixed="-p <password>" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="1" required="0"> + <parameter name="passwd_script" unique="0" required="0"> <getopt mixed="-S <script>" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="1" required="0"> + <parameter name="cmd_prompt" unique="0" required="0"> <getopt mixed="-c <prompt>" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to use cmd_prompt as the command prompt</shortdesc> </parameter> - <parameter name="drac_version" unique="1" required="0"> + <parameter name="drac_version" unique="0" required="0"> <getopt mixed="-d <version>" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to treat the device as though it was for the specified drac version</shortdesc> </parameter> - <parameter name="module_name" unique="1" required="0"> + <parameter name="module_name" unique="0" required="0"> <getopt mixed="-m <modulename>" /> <content type="string"/> <shortdesc lang="en">The module name of the blade when using DRAC/MC firmware.</shortdesc> </parameter> - <parameter name="debug" unique="1" required="0"> + <parameter name="debug" unique="0" required="0"> <getopt mixed="-D <dumpfile>" /> <content type="string"/> <shortdesc lang="en">Debug file of the telnet interaction</shortdesc> </parameter> - <parameter name="delay" unique="1" required="0"> + <parameter name="delay" unique="0" required="0"> <getopt mixed="-f <seconds>" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index 6270cee..30eaca1 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -83,37 +83,37 @@ fence_egenera is an I/O Fencing agent which can be used with the Egenera Blade </longdesc> <vendor-url>http://www.bull.com</vendor-url> <parameters> - <parameter name="action" unique="1" required="1"> + <parameter name="action" unique="0" required="1"> <getopt mixed="-o <action>" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> - <parameter name="cserver" unique="1" required="1"> + <parameter name="cserver" unique="0" required="1"> <getopt mixed="-c <cserver>" /> <content type="string" /> <shortdesc lang="en">The cserver to ssh to. cserver can be in the form user@hostname to specify a different user to login as.</shortdesc> </parameter> - <parameter name="pserver" unique="1" required="1"> + <parameter name="pserver" unique="0" required="1"> <getopt mixed="-p <pserver>" /> <content type="string" /> <shortdesc lang="en">The pserver to operate on.</shortdesc> </parameter> - <parameter name="user" unique="1" required="1"> + <parameter name="user" unique="0" required="1"> <getopt mixed="-u <name>" /> <content type="string" default="root" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> - <parameter name="lpan" unique="1" required="1"> + <parameter name="lpan" unique="0" required="1"> <getopt mixed="-l <lpan>" /> <content type="string" /> <shortdesc lang="en">The lpan to operate on.</shortdesc> </parameter> - <parameter name="delay" unique="1" required="0"> + <parameter name="delay" unique="0" required="0"> <getopt mixed="-f <seconds>" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> - <parameter name="help" unique="1" required="0"> + <parameter name="help" unique="0" required="0"> <getopt mixed="-h" /> <content type="string" /> <shortdesc lang="en">Display help and exit</shortdesc> diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c index e224db3..fa1f6a4 100644 --- a/fence/agents/kdump/fence_kdump.c +++ b/fence/agents/kdump/fence_kdump.c @@ -181,56 +181,56 @@ do_action_metadata (const char *self)
fprintf (stdout, "<parameters>\n");
- fprintf (stdout, "\t<parameter name="nodename" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="nodename" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-n, --nodename" />\n"); fprintf (stdout, "\t\t<content type="string" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Name or IP address of node to be fenced"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="ipport" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="ipport" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-p, --ipport" />\n"); fprintf (stdout, "\t\t<content type="string" default="7410" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Port number"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="family" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="family" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-f, --family" />\n"); fprintf (stdout, "\t\t<content type="string" default="auto" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Network family"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="action" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="action" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-o, --action" />\n"); fprintf (stdout, "\t\t<content type="string" default="off" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Fencing action"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="timeout" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="timeout" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-t, --timeout" />\n"); fprintf (stdout, "\t\t<content type="string" default="60" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Timeout in seconds"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="verbose" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="verbose" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-v, --verbose" />\n"); fprintf (stdout, "\t\t<content type="boolean" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Print verbose output"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="version" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="version" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-V, --version" />\n"); fprintf (stdout, "\t\t<content type="boolean" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", "Print version"); fprintf (stdout, "\t</parameter>\n");
- fprintf (stdout, "\t<parameter name="usage" unique="1" required="0">\n"); + fprintf (stdout, "\t<parameter name="usage" unique="0" required="0">\n"); fprintf (stdout, "\t\t<getopt mixed="-h, --help" />\n"); fprintf (stdout, "\t\t<content type="boolean" />\n"); fprintf (stdout, "\t\t<shortdesc lang="en">%s</shortdesc>\n", diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl index 87a599c..ef7d14d 100644 --- a/fence/agents/scsi/fence_scsi.pl +++ b/fence/agents/scsi/fence_scsi.pl @@ -702,42 +702,42 @@ sub print_metadata () " shortdesc="fence agent for SCSI-3 persistent reservations">\n"; print "<longdesc>fence_scsi</longdesc>\n"; print "<parameters>\n"; - print "\t<parameter name="aptpl" unique="1" required="0">\n"; + print "\t<parameter name="aptpl" unique="0" required="0">\n"; print "\t\t<getopt mixed="-a"/>\n"; print "\t\t<content type="boolean"/>\n"; print "\t\t<shortdesc lang="en">" . "Use APTPL flag for registrations" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name="devices" unique="1" required="0">\n"; + print "\t<parameter name="devices" unique="0" required="0">\n"; print "\t\t<getopt mixed="-d"/>\n"; print "\t\t<content type="string"/>\n"; print "\t\t<shortdesc lang="en">" . "List of devices to be used for fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name="logfile" unique="1" required="0">\n"; + print "\t<parameter name="logfile" unique="0" required="0">\n"; print "\t\t<getopt mixed="-f"/>\n"; print "\t\t<content type="string"/>\n"; print "\t\t<shortdesc lang="en">" . "File to write error/debug messages" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name="key" unique="1" required="0">\n"; + print "\t<parameter name="key" unique="0" required="0">\n"; print "\t\t<getopt mixed="-k"/>\n"; print "\t\t<content type="string"/>\n"; print "\t\t<shortdesc lang="en">" . "Key value to be used for fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name="action" unique="1" required="0">\n"; + print "\t<parameter name="action" unique="0" required="0">\n"; print "\t\t<getopt mixed="-o"/>\n"; print "\t\t<content type="string" default="off"/>\n"; print "\t\t<shortdesc lang="en">" . "Fencing action" . "</shortdesc>\n"; print "\t</parameter>\n"; - print "\t<parameter name="nodename" unique="1" required="0">\n"; + print "\t<parameter name="nodename" unique="0" required="0">\n"; print "\t\t<getopt mixed="-n"/>\n"; print "\t\t<content type="string"/>\n"; print "\t\t<shortdesc lang="en">" .
cluster-commits@lists.stg.fedorahosted.org