fence-agents: RHEL6 - fence_scsi: allow action=metadata via STDIN

rohara rohara at fedoraproject.org
Thu Dec 20 17:44:01 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=069a3de2ff46c8c43aad437cd636049c91e14737
Commit:        069a3de2ff46c8c43aad437cd636049c91e14737
Parent:        825ca4f88958060fb408ba0e1798e1eef58426d3
Author:        Ryan O'Hara <rohara at redhat.com>
AuthorDate:    Thu Dec 20 11:41:11 2012 -0600
Committer:     Ryan O'Hara <rohara at redhat.com>
CommitterDate: Thu Dec 20 11:41:11 2012 -0600

fence_scsi: allow action=metadata via STDIN

Resolves: rhbz#837174

Signed-off-by: Ryan O'Hara <rohara at redhat.com>
---
 fence/agents/scsi/fence_scsi.pl |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index ef7d14d..60923f2 100644
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -749,7 +749,7 @@ sub print_metadata ()
     print "\t<action name=\"on\"/>\n";
     print "\t<action name=\"off\"/>\n";
     print "\t<action name=\"status\"/>\n";
-    print "\t<action name=\"metadata\"/>\n";
+    print "\t<action name=\"metadata\" on_target=\"1\"/>\n";
     print "</actions>\n";
     print "</resource-agent>\n";
 
@@ -763,16 +763,16 @@ if (@ARGV > 0) {
 
     print_usage if (defined $opt_h);
     print_version if (defined $opt_V);
-
-    ## handle the metadata action here to avoid other parameter checks
-    ##
-    if ($opt_o =~ /^metadata$/i) {
-	print_metadata;
-    }
 } else {
     get_options_stdin ();
 }
 
+## handle the metadata action here to avoid other parameter checks
+##
+if ($opt_o =~ /^metadata$/i) {
+    print_metadata;
+}
+
 ## if the logfile (-f) parameter was specified, open the logfile
 ## and redirect STDOUT and STDERR to the logfile.
 ##


More information about the cluster-commits mailing list