Blob Blame History Raw
commit 003fcf63623fe42b5879908eaec8b87da160be9c
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Fri Sep 27 16:31:44 2013 +0200

    fencing: Add information about automatic "unfence" to metadata
    
    Resolves: rhbz#1012994

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index bb144bb..d6b02d3 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -487,7 +487,11 @@ def metadata(avail_opt, options, docs):
 			print "\t</parameter>"
 	print "</parameters>"
 	print "<actions>"
-	print "\t<action name=\"on\" />"
+	if avail_opt.count("fabric_fencing") == 1:
+		## do 'unfence' at the start
+		print "\t<action name=\"on\" automatic=\"1\"/>"
+	else:
+		print "\t<action name=\"on\" automatic=\"0\"/>"
 	print "\t<action name=\"off\" />"
 
 	if avail_opt.count("fabric_fencing") == 0:
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 4e5cc96..2585f9e 100644
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -757,7 +757,7 @@ sub print_metadata ()
     print "\t</parameter>\n";
     print "</parameters>\n";
     print "<actions>\n";
-    print "\t<action name=\"on\" on_target=\"1\"/>\n";
+    print "\t<action name=\"on\" on_target=\"1\" automatic=\"1\"/>\n";
     print "\t<action name=\"off\"/>\n";
     print "\t<action name=\"status\"/>\n";
     print "\t<action name=\"metadata\"/>\n";