fence-agents: master - fence: Make SNMP v3 default for fence_intelmodular

[Jan Friesse <honzaf@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=6a175ac6ee758d9f548ce56d88e5f042f569370c
Commit:        6a175ac6ee758d9f548ce56d88e5f042f569370c
Parent:        70d4bf4110548b71ad987b1272dd3d4af43108d9
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Wed Apr 22 17:51:32 2009 +0200
Committer:     Jan Friesse <jfriesse@redhat.com>
CommitterDate: Wed Apr 22 17:51:32 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).