fence-agents: master - fence_lpar: option -x for ssh was required
Marek Grác
marx@fedoraproject.org
Mon Jul 13 15:22:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=7d3cd2d85b83662a6da8250c5aa7438f21f1b28f
Commit: 7d3cd2d85b83662a6da8250c5aa7438f21f1b28f
Parent: 122857accf9e20167c2fae3ef76f24979a0d0ca6
Author: Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate: Mon Jul 13 17:13:34 2009 +0200
Committer: Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Mon Jul 13 17:13:34 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 eaff7a0..bd4c114 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -144,7 +144,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, --hmc-version=<version> Force HMC version to use: 3, 4 (default)",
"required" : "0",
"shortdesc" : "Force HMC version to use (3 or 4)",
"default" : "4",
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index d3c6f53..31a227f 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -138,6 +138,7 @@ def main():
atexit.register(atexit_handler)
options = check_input(device_opt, process_input(device_opt))
+ options["-x"] = 1
##
## Fence agent specific settings and default values
@@ -145,9 +146,6 @@ def main():
if 0 == options.has_key("-c"):
options["-c"] = [ ":~>", "]\$", "\$ " ]
- if 0 == options.has_key("-x"):
- fail_usage("Failed: You have to use ssh connection (-x) to fence device")
-
show_docs(options)
if 0 == options.has_key("-s"):
More information about the Cluster-cvs
mailing list