public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* STABLE2 - fence: Fix fence agent for VMware ESX.
@ 2008-09-22 9:17 Jan Friesse
0 siblings, 0 replies; 2+ messages in thread
From: Jan Friesse @ 2008-09-22 9:17 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8a110f230d45b330cc3c088b804ad62a245709a1
Commit: 8a110f230d45b330cc3c088b804ad62a245709a1
Parent: 5c0eeefffe2ef260383ae0287cb82bfdd3a38a70
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:15: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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* STABLE2 - fence: Fix fence agent for VMware ESX.
@ 2008-09-16 14:08 Jan Friesse
0 siblings, 0 replies; 2+ messages in thread
From: Jan Friesse @ 2008-09-16 14:08 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=63a9107568c5d33b79cef212322c951f5ea6cec2
Commit: 63a9107568c5d33b79cef212322c951f5ea6cec2
Parent: f2f60eab693300a496eee220be53c9aa44784323
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:31:34 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-22 9:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-22 9:17 STABLE2 - fence: Fix fence agent for VMware ESX Jan Friesse
-- strict thread matches above, loose matches on Subject: below --
2008-09-16 14:08 Jan Friesse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).