fence-agents: master - fencing: Fabric fence agents should have default action "off"

Marek GrĂ¡c marx at fedoraproject.org
Wed Jan 22 12:54:18 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=8b127ebff6a38b0c6dd9c2a1ad738e2d7637e0fa
Commit:        8b127ebff6a38b0c6dd9c2a1ad738e2d7637e0fa
Parent:        530e97f05e43bdd5bef9d24c75d4cc3057a491e8
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Jan 22 13:51:50 2014 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Jan 22 13:51:50 2014 +0100

fencing: Fabric fence agents should have default action "off"

Previously, when you have run fence agent without -o XYZ, reboot was performed. Fabric fence agents do not have them
so fence agent fails. This update does not fix only this issue but also text --help and in manual pages.

Resolves: rhbz#1021392
---
 fence/agents/lib/fencing.py.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 9cc7407..889bb04 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -618,6 +618,10 @@ def check_input(device_opt, opt):
 	else:
 		all_opt["login"]["required"] = "0"
 
+	if device_opt.count("fabric_fencing"):
+		all_opt["action"]["default"] = "off"
+		all_opt["action"]["help"] = "-o, --action=[action]          Action: status, off (default) or on"
+
 	## Set default values
 	#####
 	for opt in device_opt:


More information about the cluster-commits mailing list