From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20741 invoked by alias); 21 Aug 2009 11:22:35 -0000 Received: (qmail 20734 invoked by alias); 21 Aug 2009 11:22:35 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.3 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: fence-agents: master - fencing: Fencing fails when using implicit connection method other then telnet To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d07c924e6c5637f0731e76d7d5fcf84288854b24 X-Git-Newrev: 8de93defd88b88045379c66faf694fda3d13394b From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090821112209.6B87E1201A2@lists.fedorahosted.org> Date: Fri, 21 Aug 2009 11:22:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.19 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/msg00231.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=8de93defd88b88045379c66faf694fda3d13394b Commit: 8de93defd88b88045379c66faf694fda3d13394b Parent: d07c924e6c5637f0731e76d7d5fcf84288854b24 Author: Marek 'marx' Grac AuthorDate: Fri Aug 21 13:17:00 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Fri Aug 21 13:17:00 2009 +0200 fencing: Fencing fails when using implicit connection method other then telnet Bug was introduced with ipport option where port number was set before -x/-z was set. It did not affect those who use -x / -z. --- fence/agents/alom/fence_alom.py | 8 ++++---- fence/agents/ilo/fence_ilo.py | 7 ++++--- fence/agents/ldom/fence_ldom.py | 6 +++--- fence/agents/lpar/fence_lpar.py | 5 +++-- fence/agents/virsh/fence_virsh.py | 6 +++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index 5fe72aa..d88f718 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -48,15 +48,15 @@ def main(): "secure", "test", "inet4_only", "inet6_only", "ipport" ] atexit.register(atexit_handler) - - options = check_input(device_opt, process_input(device_opt)) + + pinput = process_input(device_opt) + pinput["-x"] = 1 + options = check_input(device_opt, pinput) # Default command is sc> if (not options.has_key("-c")): options["-c"] = "sc\>\ " - # Default to ssh - options["-x"] = 1 options["telnet_over_ssh"] = 1 show_docs(options) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index e15052d..7483780 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -60,9 +60,10 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) - - options["-z"] = 1 + pinput = process_input(device_opt) + pinput["-z"] = 1 + options = check_input(device_opt, pinput) + LOGIN_TIMEOUT = 10 show_docs(options) diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index e6bf656..d5e7285 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -88,7 +88,9 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + pinput = process_input(device_opt) + pinput["-x"] = 1 + options = check_input(device_opt, pinput) ## ## Fence agent specific defaults @@ -96,8 +98,6 @@ def main(): if (not options.has_key("-c")): options["-c"] = "\ $" - - options["-x"] = 1 show_docs(options) ## diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index ea10596..9a8e636 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -137,8 +137,9 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) - options["-x"] = 1 + pinput = process_input(device_opt) + pinput["-x"] = 1 + options = check_input(device_opt, pinput) ## ## Fence agent specific settings and default values diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 432bdb9..eae7405 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -67,14 +67,14 @@ def main(): atexit.register(atexit_handler) - options = check_input(device_opt, process_input(device_opt)) + pinput = process_input(device_opt) + pinput["-x"] = 1 + options = check_input(device_opt, pinput) ## Defaults for fence agent if 0 == options.has_key("-c"): options["-c"] = "\[EXPECT\]#\ " - options["-x"]=1 - options["ssh_options"]="-t '/bin/bash -c \"PS1=\[EXPECT\]#\ /bin/bash --noprofile --norc\"'" show_docs(options)