From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26658 invoked by alias); 21 May 2008 15:39:36 -0000 Received: (qmail 26627 invoked by uid 9650); 21 May 2008 15:39:36 -0000 Date: Wed, 21 May 2008 15:39:00 -0000 Message-ID: <20080521153936.26612.qmail@sourceware.org> From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-92-g8397bb4 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 508cfb5fb512c62e618ce20d0b7bf434ac0764ba X-Git-Newrev: 8397bb45819a981bfc112dd8140da753983fdc11 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/msg00383.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=8397bb45819a981bfc112dd8140da753983fdc11 The branch, RHEL5 has been updated via 8397bb45819a981bfc112dd8140da753983fdc11 (commit) from 508cfb5fb512c62e618ce20d0b7bf434ac0764ba (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 8397bb45819a981bfc112dd8140da753983fdc11 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 bc1c69c..4ac8be9 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 4f13a55..d8b2c4e 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