Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=aad5c7...
Commit: aad5c7524d6842e7a276c7d75044ccfe86646b4c
Parent: e91f58c8a4a69f0a13b0fd388f90458ec91c68df
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Aug 28 09:44:39 2013 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Aug 28 09:44:39 2013 +0200
fence_cisco_ucs: Fix problem with --login-timeout
Resolves: rhbz#978325
---
fence/agents/cisco_ucs/fence_cisco_ucs.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py
b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index d1d8501..ea21e6c 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -102,7 +102,7 @@ def main():
device_opt = [ "help", "version", "agent",
"quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd",
"passwd_script",
"ssl", "inet4_only", "inet6_only", "ipport",
"port",
- "web", "separator", "power_wait",
"power_timeout",
+ "web", "separator", "power_wait",
"power_timeout", "login_timeout",
"shell_timeout", "suborg" ]
atexit.register(atexit_handler)
@@ -121,7 +121,7 @@ used with Cisco UCS to fence machines."
time.sleep(int(options["-f"]))
try:
- res = send_command(options, "<aaaLogin inName=\"" +
options["-l"] + "\" inPassword=\"" + options["-p"]
+ "\" />", int(options("-y")))
+ res = send_command(options, "<aaaLogin inName=\"" +
options["-l"] + "\" inPassword=\"" + options["-p"]
+ "\" />", int(options["-y"]))
result = re_cookie.search(res)
if (result == None):