Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 8afc2b31b9f5742b5ab56b35cf34e01c75284a00
Parent: aa2747f28b0541947dc0b718484cf5278f46c2e1
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Tue Dec 22 14:22:18 2009 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Tue Dec 22 14:22:18 2009 +0100
fencing: Add support for identity files
Some fence agents contains support for ssh but did not support identity
files.
---
fence/agents/alom/fence_alom.py | 2 +-
fence/agents/apc/fence_apc.py | 2 +-
fence/agents/drac5/fence_drac5.py | 2 +-
fence/agents/ilo_mp/fence_ilo_mp.py | 2 +-
fence/agents/lpar/fence_lpar.py | 2 +-
fence/agents/rsa/fence_rsa.py | 2 +-
fence/agents/vmware/fence_vmware.py | 2 +-
fence/agents/wti/fence_wti.py | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index 086b69b..5dfe9e0 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -45,7 +45,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "secure", "test", "inet4_only", "inet6_only",
"ipport",
+ "secure", "identity_file", "test",
"inet4_only", "inet6_only", "ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index ea29d6a..b70b220 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -184,7 +184,7 @@ 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", "identity_file", "switch",
"test", "separator",
"inet4_only", "inet6_only", "ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
index b185541..900b547 100755
--- a/fence/agents/drac5/fence_drac5.py
+++ b/fence/agents/drac5/fence_drac5.py
@@ -83,7 +83,7 @@ def get_list_devices(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "cmd_prompt", "secure", "drac_version",
"module_name",
+ "cmd_prompt", "secure", "identity_file",
"drac_version", "module_name",
"separator", "inet4_only", "inet6_only",
"ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py
index 83aec1d..b96c417 100644
--- a/fence/agents/ilo_mp/fence_ilo_mp.py
+++ b/fence/agents/ilo_mp/fence_ilo_mp.py
@@ -31,7 +31,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "secure", "cmd_prompt", "ipport",
"login_eol_lf",
+ "secure", "identity_file", "cmd_prompt",
"ipport", "login_eol_lf",
"separator", "inet4_only", "inet6_only",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 52711d8..c8bf22f 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -132,7 +132,7 @@ def get_lpar_list(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "secure", "partition", "managed",
"hmc_version", "cmd_prompt",
+ "secure", "identity_file", "partition",
"managed", "hmc_version", "cmd_prompt",
"separator", "inet4_only", "inet6_only",
"ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index a18b43d..133129e 100644
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -41,7 +41,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "cmd_prompt", "secure", "ipport",
+ "cmd_prompt", "secure", "identity_file",
"ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index 75fd887..ad51687 100644
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -287,7 +287,7 @@ def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
"test", "port", "separator", "exec",
"vmware_type",
- "vmware_datacenter", "secure",
+ "vmware_datacenter", "secure", "identity_file",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index 3ac9217..a45e3ec 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -75,7 +75,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
- "cmd_prompt", "secure", "port", "no_login",
"no_password",
+ "cmd_prompt", "secure", "identity_file",
"port", "no_login", "no_password",
"test", "separator", "inet4_only",
"inet6_only", "ipport",
"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]