cluster: STABLE2 - fence_lpar: option -x for ssh was required

["Marek Grác" <marx@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=36fb115aedfb2cef7afab7b9f0855aadd1d1f619
Commit:        36fb115aedfb2cef7afab7b9f0855aadd1d1f619
Parent:        8956c953c63ff8d4b3c3cb8719a739862e21beb1
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Mon Jul 13 17:09:12 2009 +0200
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Mon Jul 13 17:11:20 2009 +0200

fence_lpar: option -x for ssh was required

Option -x is no longer required for LPAR. It is turned on automatically. This
should not change behaviour of fence agent as -x was required before and no
other access to LPAR/HMC is supported.
---
 fence/agents/lib/fencing.py.py  |    2 +-
 fence/agents/lpar/fence_lpar.py |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index e8f89ec..4d41fcb 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -104,7 +104,7 @@ all_opt = {
 	"hmc_version" : {
 		"getopt" : "H:",
 		"longopt" : "hmc-version",
-		"help" : "-H, --hmc-version=<version>   Force HMC version to use: 3, 4 (default)",
+		"help" : "-H <version>   Force HMC version to use: 3, 4 (default)",
 		"order" : 1 },
 	"ribcl" : {
 		"getopt" : "r:",
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index c20cde5..1990f42 100755
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -85,6 +85,7 @@ def main():
 			"cmd_prompt", "ipport" ]
 
 	options = check_input(device_opt, process_input(device_opt))
+	options["-x"] = 1
 
 	## 
 	## Fence agent specific defaults
@@ -95,9 +96,6 @@ def main():
 	if 0 == options.has_key("-H"):
 		options["-H"] = "4"
 
-	if 0 == options.has_key("-x"):
-		fail_usage("Failed: You have to use ssh connection (-x) to fence device")
-
 	if 0 == options.has_key("-s"):
 		fail_usage("Failed: You have to enter name of managed system")