From f3e58e0c10917cf9b0c214f4ac1332625a30f680 Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Wed, 21 Jul 2010 23:47:48 +0200
Subject: [PATCH] fencing: Add support for identity files

Some fence agents contains support for ssh but did not support identity
files.

Resolves: rhbz#582334
---
 fence/agents/apc/fence_apc.py       |    2 +-
 fence/agents/drac/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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index b9e253e..1aa7bed 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -185,7 +185,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/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
index 46c9fb0..ab02b21 100755
--- a/fence/agents/drac/fence_drac5.py
+++ b/fence/agents/drac/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 eef4f30..06e1358 100644
--- a/fence/agents/ilo_mp/fence_ilo_mp.py
+++ b/fence/agents/ilo_mp/fence_ilo_mp.py
@@ -46,7 +46,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 5b12716..2973bc9 100755
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -133,7 +133,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 d836711..36a9f04 100755
--- 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 a88ed91..a874db2 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 51c2b59..5749f76 100755
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -76,7 +76,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" ]
 
-- 
1.6.0.6