|
 |
d67cb5 |
commit 003fcf63623fe42b5879908eaec8b87da160be9c
|
|
|
d67cb5 |
Author: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
d67cb5 |
Date: Fri Sep 27 16:31:44 2013 +0200
|
|
|
d67cb5 |
|
|
|
d67cb5 |
fencing: Add information about automatic "unfence" to metadata
|
|
|
d67cb5 |
|
|
|
d67cb5 |
Resolves: rhbz#1012994
|
|
|
d67cb5 |
|
|
|
d67cb5 |
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
|
|
|
d67cb5 |
index bb144bb..d6b02d3 100644
|
|
|
d67cb5 |
--- a/fence/agents/lib/fencing.py.py
|
|
|
d67cb5 |
+++ b/fence/agents/lib/fencing.py.py
|
|
|
d67cb5 |
@@ -487,7 +487,11 @@ def metadata(avail_opt, options, docs):
|
|
|
d67cb5 |
print "\t</parameter>"
|
|
|
d67cb5 |
print "</parameters>"
|
|
|
d67cb5 |
print "<actions>"
|
|
|
d67cb5 |
- print "\t<action name=\"on\" />"
|
|
|
d67cb5 |
+ if avail_opt.count("fabric_fencing") == 1:
|
|
|
d67cb5 |
+ ## do 'unfence' at the start
|
|
|
d67cb5 |
+ print "\t<action name=\"on\" automatic=\"1\"/>"
|
|
|
d67cb5 |
+ else:
|
|
|
d67cb5 |
+ print "\t<action name=\"on\" automatic=\"0\"/>"
|
|
|
d67cb5 |
print "\t<action name=\"off\" />"
|
|
|
d67cb5 |
|
|
|
d67cb5 |
if avail_opt.count("fabric_fencing") == 0:
|
|
|
d67cb5 |
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
|
|
|
d67cb5 |
index 4e5cc96..2585f9e 100644
|
|
|
d67cb5 |
--- a/fence/agents/scsi/fence_scsi.pl
|
|
|
d67cb5 |
+++ b/fence/agents/scsi/fence_scsi.pl
|
|
|
d67cb5 |
@@ -757,7 +757,7 @@ sub print_metadata ()
|
|
|
d67cb5 |
print "\t</parameter>\n";
|
|
|
d67cb5 |
print "</parameters>\n";
|
|
|
d67cb5 |
print "<actions>\n";
|
|
|
d67cb5 |
- print "\t<action name=\"on\" on_target=\"1\"/>\n";
|
|
|
d67cb5 |
+ print "\t<action name=\"on\" on_target=\"1\" automatic=\"1\"/>\n";
|
|
|
d67cb5 |
print "\t<action name=\"off\"/>\n";
|
|
|
d67cb5 |
print "\t<action name=\"status\"/>\n";
|
|
|
d67cb5 |
print "\t<action name=\"metadata\"/>\n";
|