From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12347 invoked by alias); 19 May 2008 15:34:47 -0000 Received: (qmail 12302 invoked by uid 9650); 19 May 2008 15:34:47 -0000 Date: Mon, 19 May 2008 15:34:00 -0000 Message-ID: <20080519153446.12285.qmail@sourceware.org> From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-59-g115f01b X-Git-Refname: refs/heads/RHEL47 X-Git-Reftype: branch X-Git-Oldrev: f9daca2d6e65a8265c2358714e5038426adabe49 X-Git-Newrev: 115f01bfcf32a87e9d3bc0b215ad9a61ecf9b903 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: 2008-q2/txt/msg00353.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=115f01bfcf32a87e9d3bc0b215ad9a61ecf9b903 The branch, RHEL47 has been updated via 115f01bfcf32a87e9d3bc0b215ad9a61ecf9b903 (commit) from f9daca2d6e65a8265c2358714e5038426adabe49 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 115f01bfcf32a87e9d3bc0b215ad9a61ecf9b903 Author: Marek 'marx' Grac Date: Mon May 19 17:28:39 2008 +0200 [FENCE] Fix #248609: SSH support in Bladecenter fencing (ssh) Complete ssh support for Bladecenter. You can use password or private key (identity_file on STDIN; -k in getopt) to login to system. This patch contains complete infrastructure (usable also by other agents). ----------------------------------------------------------------------- Summary of changes: fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/lib/fencing.py.py | 40 ++++++++++++++++++++----- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 6670bcb..ff7ad67 100755 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -64,7 +64,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "port" ] + "cmd_prompt", "secure", "port", "identity_file" ] options = check_input(device_opt, process_input(device_opt)) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 0ddf173..7aa8a0c 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -72,12 +72,16 @@ all_opt = { "order" : 1 }, "passwd" : { "getopt" : "p:", - "help" : "-p Login password", + "help" : "-p Login password or passphrase", "order" : 1 }, "passwd_script" : { "getopt" : "S:", "help" : "-S