fence-agents: master - fencing: fence_rsa fails to login

Marek Grác marx at fedoraproject.org
Tue Dec 22 14:50:54 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=1c1883f8d650a8c1b1fe03ad4a47654031be4c96
Commit:        1c1883f8d650a8c1b1fe03ad4a47654031be4c96
Parent:        8c15101216a7a87134e0f9b8abe1f2eb444fcee1
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Tue Dec 22 15:47:57 2009 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Tue Dec 22 15:47:57 2009 +0100

fencing: fence_rsa fails to login

New version/firmware have new login screen which was not supported. Also it
is slower, so default timeout for login-timeout is set to 10 seconds.
---
 fence/agents/lib/fencing.py.py |    2 +-
 fence/agents/rsa/fence_rsa.py  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index c4556d5..1a34210 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -804,7 +804,7 @@ def fence_login(options):
 		login_eol = "\r\n"
 
 	try:
-		re_login = re.compile("(login: )|(Login Name:  )|(username: )|(User Name :)", re.IGNORECASE)
+		re_login = re.compile("(login\s*: )|(Login Name:  )|(username: )|(User Name :)", re.IGNORECASE)
 		re_pass  = re.compile("password", re.IGNORECASE)
 
 		if options.has_key("-z"):
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index 415df52..cce3777 100644
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -45,6 +45,7 @@ def main():
 
 	atexit.register(atexit_handler)
 
+	all_opt["login_timeout"]["default"] = 10
 	options = check_input(device_opt, process_input(device_opt))
 
 	## 


More information about the cluster-commits mailing list