From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32101 invoked by alias); 13 Jul 2009 15:06:22 -0000 Received: (qmail 32095 invoked by alias); 13 Jul 2009 15:06:22 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - fence_lpar: option -x for ssh was required To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 634c700d5781476ed777266950bd84e4952fa4a9 X-Git-Newrev: 8b932966fd7407b85b0b34ca71cb7471bbef8078 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090713150559.0CF301201FF@lists.fedorahosted.org> Date: Mon, 13 Jul 2009 15:06:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00045.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8b932966fd7407b85b0b34ca71cb7471bbef8078 Commit: 8b932966fd7407b85b0b34ca71cb7471bbef8078 Parent: 634c700d5781476ed777266950bd84e4952fa4a9 Author: Marek 'marx' Grac AuthorDate: Mon Jul 13 16:59:59 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Mon Jul 13 16:59:59 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= Force HMC version to use: 3, 4 (default)", + "help" : "-H, --hmc-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 f6e4a58..aaaa65b 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"):