From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26982 invoked by alias); 21 May 2008 15:40:10 -0000 Received: (qmail 26949 invoked by uid 9650); 21 May 2008 15:40:09 -0000 Date: Wed, 21 May 2008 15:40:00 -0000 Message-ID: <20080521154009.26933.qmail@sourceware.org> From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.02-27-g776cef9 X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: b88e25c2d3679cf06f3b9c896365b359a29bba0f X-Git-Newrev: 776cef92f7ca1542d63771923f4ccaeedabd613e 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/msg00384.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=776cef92f7ca1542d63771923f4ccaeedabd613e The branch, STABLE2 has been updated via 776cef92f7ca1542d63771923f4ccaeedabd613e (commit) from b88e25c2d3679cf06f3b9c896365b359a29bba0f (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 776cef92f7ca1542d63771923f4ccaeedabd613e Author: Marek 'marx' Grac Date: Wed May 21 17:26:03 2008 +0200 [FENCE] Fix #447378 - fence_apc unable to connect via ssh to APC 7900 Problem was that even with ssh itself it was really painfull to log into this device (15 - 40 seconds). After specifying cipher and protocol we can login and check status in time comparable to others. ----------------------------------------------------------------------- Summary of changes: fence/agents/apc/fence_apc.py | 5 ++++- fence/agents/lib/fencing.py.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index bda9c6d..a0953a2 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -11,7 +11,8 @@ ## AP7941 AOS v3.5.7, PDU APP v3.5.6 ## AP9606 AOS v2.5.4, PDU APP v2.7.3 ## -## @note: ssh is very slow on AP7951 device +## @note: ssh is very slow on AP79XX devices protocol (1) and +## cipher (des/blowfish) have to be defined ##### import sys, re, pexpect @@ -172,6 +173,8 @@ def main(): ## ## Fence agent specific defaults ##### + options["ssh_options"] = "-1 -c blowfish" + if 0 == options.has_key("-c"): options["-c"] = "\n>" diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index c69e397..61e5fb2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -342,7 +342,10 @@ def fence_login(options): re_pass = re.compile("password", re.IGNORECASE) if options.has_key("-x") and 0 == options.has_key("-k"): - conn = fspawn ('ssh ' + options["-l"] + "@" + options["-a"]) + command = 'ssh ' + options["-l"] + "@" + options["-a"] + if options.has_key("ssh_options"): + command += ' ' + options["ssh_options"] + conn = fspawn (command) result = conn.log_expect(options, [ "ssword:", "Are you sure you want to continue connecting (yes/no)?" ], LOGIN_TIMEOUT) if result == 1: conn.sendline("yes") hooks/post-receive -- Cluster Project