master - fence: Fix fence agent for VMware ESX.

master - fence: Fix fence agent for VMware ESX.

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a26502447c49fad4a11adef8fca13439b3292e99
Commit:        a26502447c49fad4a11adef8fca13439b3292e99
Parent:        0a27fa730d25f54249ac97f3b37a609487bdb771
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Mon Sep 22 11:12:24 2008 +0200
Committer:     Jan Friesse <jfriesse@redhat.com>
CommitterDate: Mon Sep 22 11:16:18 2008 +0200

fence: Fix fence agent for VMware ESX.

Added support for identity_file.
---
 fence/agents/vmware/fence_vmware.py |    4 ++--
 fence/man/fence_vmware.8            |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index e02052f..e9a061e 100755
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -80,8 +80,8 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"secure",  "test" , "vmipaddr", "vmlogin", "vmpasswd", 
-			"port", "vmpasswd_script" ]
+			"secure",  "identity_file", "test" , "vmipaddr", "vmlogin", 
+			"vmpasswd", "port", "vmpasswd_script" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/fence/man/fence_vmware.8 b/fence/man/fence_vmware.8
index de9b6ff..31ea5f8 100644
--- a/fence/man/fence_vmware.8
+++ b/fence/man/fence_vmware.8
@@ -68,6 +68,9 @@ Name of virtual machine to fence (ie. /vmfs/volumes/48bfcbd1-4624461c-8250-0015c
 \fB-x\fP
 Use secure connection over ssh (this is default, and can't be disabled) 
 .TP
+\fB-k\fP \fIfilename\fR
+Identity file (private key) for ssh
+.TP
 \fB-T\fP
 Test only.  Answer NO to the confirmation prompt instead of YES.
 .TP
@@ -117,6 +120,9 @@ Name of virtual machine to fence (ie. /vmfs/volumes/48bfcbd1-4624461c-8250-0015c
 .TP
 \fIsecure = < param >\fR
 Use secure connection over ssh (this is default, and can't be disabled) 
+.TP 
+\fIidentity_file = < param >\fR
+Identity file (private key) for ssh
 .TP
 \fItest = < param >\fR
 Test only.  Answer NO to the confirmation prompt instead of YES.

master - fence: Fix fence agent for VMware ESX.

[Jan Friesse]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=932320c01e285d81dd59c421b406229a5e56b75d
Commit:        932320c01e285d81dd59c421b406229a5e56b75d
Parent:        fd9c342de7304376bc2cc50d4b0e56d54abfc822
Author:        Jan Friesse <jfriesse@redhat.com>
AuthorDate:    Tue Sep 16 10:30:31 2008 +0200
Committer:     Jan Friesse <jfriesse@redhat.com>
CommitterDate: Tue Sep 16 10:30:31 2008 +0200

fence: Fix fence agent for VMware ESX.

Use dynamic import path and RELEASE_VERSION variable.
---
 fence/agents/vmware/fence_vmware.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index 5e01ffb..e02052f 100755
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -8,11 +8,11 @@
 #####
 
 import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
+sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
+RELEASE_VERSION="New VMware Agent - test release on steroids"
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION