From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24834 invoked by alias); 31 Aug 2009 16:02:17 -0000 Received: (qmail 24475 invoked by alias); 31 Aug 2009 16:02:16 -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: cluster: RHEL55 - fence: Add support for IPv4/IPv6 forcing To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL55 X-Git-Reftype: branch X-Git-Oldrev: a39b80511c6a44a838fb549297f4d696c5e299e2 X-Git-Newrev: 48dea103eae0f4e963d295e21c242cb104d35d65 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090831160153.52C5B1201FC@lists.fedorahosted.org> Date: Mon, 31 Aug 2009 16:02:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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/msg00250.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=48dea103eae0f4e963d295e21c242cb104d35d65 Commit: 48dea103eae0f4e963d295e21c242cb104d35d65 Parent: a39b80511c6a44a838fb549297f4d696c5e299e2 Author: Marek 'marx' Grac AuthorDate: Mon Aug 31 16:54:56 2009 +0200 Committer: Marek 'marx' Grac CommitterDate: Mon Aug 31 16:54:56 2009 +0200 fence: Add support for IPv4/IPv6 forcing Support is added for agents written in Python, which uses standard fencing library and connecting by SNMP/nss_wrapper or SSH. Sadly telnet distributed with Fedora/RHEL doesn't has support for forcing IPv4/IPv6 connection, so it's impossible to implement this feature for agents using it. --- fence/agents/apc/fence_apc.py | 3 +- fence/agents/bladecenter/fence_bladecenter.py | 3 +- fence/agents/cisco_mds/fence_cisco_mds.py | 2 +- fence/agents/drac/fence_drac5.py | 2 +- fence/agents/ilo/fence_ilo.py | 2 +- fence/agents/lib/fencing.py.py | 32 ++++++++++++++++++++++-- fence/agents/lpar/fence_lpar.py | 2 +- fence/agents/virsh/fence_virsh.py | 3 +- fence/agents/wti/fence_wti.py | 2 +- 9 files changed, 40 insertions(+), 11 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index b178a50..447d589 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -185,7 +185,8 @@ def set_power_status(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "port", "switch", "test", "separator" ] + "secure", "port", "switch", "test", "separator", + "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index da857ab..7f6acd7 100755 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -91,7 +91,8 @@ def get_blades_list(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "port", "identity_file", "separator" ] + "cmd_prompt", "secure", "port", "identity_file", "separator", + "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index 0817785..3ac5295 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -86,7 +86,7 @@ def main(): "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport"] + "udpport","inet4_only","inet6_only"] atexit.register(atexit_handler) diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py index ec210c5..0eece4a 100755 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -84,7 +84,7 @@ def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "drac_version", "module_name", - "separator" ] + "separator", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 7105253..4fd8404 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -57,7 +57,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "ribcl" ] + "ssl", "ribcl", "inet4_only", "inet6_only" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index e875c81..04527d1 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -206,6 +206,20 @@ all_opt = { "getopt" : "R:", "help" : "-R