From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32206 invoked by alias); 23 Apr 2009 16:20:24 -0000 Received: (qmail 32197 invoked by alias); 23 Apr 2009 16:20:23 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 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: STABLE3 - fence: Make SNMP v3 default for fence_intelmodular To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: d2e08cd600f2bd0bf140cad507a1c63d6b5bbf4c X-Git-Newrev: bc0a0bb15ea60dafd331c301344335354f819301 From: Jan Friesse Message-Id: <20090423161952.1E42F1201FB@lists.fedorahosted.org> Date: Thu, 23 Apr 2009 16:20:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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-q2/txt/msg00100.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bc0a0bb15ea60dafd331c301344335354f819301 Commit: bc0a0bb15ea60dafd331c301344335354f819301 Parent: d2e08cd600f2bd0bf140cad507a1c63d6b5bbf4c Author: Jan Friesse AuthorDate: Wed Apr 22 17:51:32 2009 +0200 Committer: Jan Friesse CommitterDate: Thu Apr 23 18:19:01 2009 +0200 fence: Make SNMP v3 default for fence_intelmodular Since Intel Modular firmware update version 2.7, SNMP v2 write support is removed and replaced by SNMP v3 write support (big thanks to Matthew Kent for point to this). This patch makes SNMP v3 default and changes man page to reflect that. --- fence/agents/intelmodular/fence_intelmodular.py | 6 ------ fence/man/fence_intelmodular.8 | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 157d0a2..6b68d0b 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -59,10 +59,6 @@ def get_outlets_status(conn, options): return result -# Define new options -def intelmodular_define_defaults(): - all_opt["snmp_version"]["default"]="1" - # Main agent method def main(): global port_oid @@ -76,8 +72,6 @@ def main(): atexit.register(atexit_handler) - intelmodular_define_defaults() - options=check_input(device_opt,process_input(device_opt)) # Operate the fencing device diff --git a/fence/man/fence_intelmodular.8 b/fence/man/fence_intelmodular.8 index a013a7f..37befa5 100644 --- a/fence/man/fence_intelmodular.8 +++ b/fence/man/fence_intelmodular.8 @@ -16,6 +16,11 @@ MFSYS35 as well). Agent internally uses snmpget, snmpset and snmpwalk command. fence_intelmodular accepts options on the command line as well as from stdin. Fenced sends parameters through stdin when it execs the agent. fence_intelmodular can be run by itself with command line options. This is useful for testing. +\fBNote:\fR +Since firmware update version 2.7, SNMP v2 write support is removed, and replaced by SNMP v3 support. So +agent now has default SNMP version 3. If you are using older firmware, please supply \fB-d\fR for command line and +\fIsnmp_version\fR option for your cluster.conf. + .SH OPTIONS .TP \fB-a\fP \fIIPaddress\fR @@ -46,7 +51,7 @@ Script to run to retrieve privacy for SNMP v3 (privacy protocol password). Login name for SNMP v3 (security name). .TP \fB-d\fP \fIversion\fR -SNMP version (1,2c,3). Default is 1. +SNMP version (1,2c,3). Default is 3. .TP \fB-b\fP \fIauth_protocol\fR SNMP authentication protocol (MD5|SHA). @@ -103,7 +108,7 @@ Password for privacy for SNMP v3 (privacy protocol password). Login name for SNMP v3 (security name). .TP \fIsnmp_version = < param >\fR -SNMP version (1,2c,3). Default is 1. +SNMP version (1,2c,3). Default is 3. .TP \fIsnmp_auth_prot = < param >\fR SNMP authentication protocol (MD5|SHA).