Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=9f44c21fe98880... Commit: 9f44c21fe98880937eb53f1e9e2c237520f86961 Parent: 6d60ac310fcb224ca921bb78c8c43fd80ec1b03e Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Dec 16 12:48:12 2013 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon Dec 16 12:48:12 2013 +0100
fencing: fence_bladecenter can not login to fence device
Resolves: rhbz#1040099 --- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/lib/fencing.py.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index d97b9e4..197f912 100755 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -124,7 +124,7 @@ and uses the command line interface to power on and off blades." ## ## Operate the fencing device ###### - conn = fence_login(options) + conn = fence_login(options, "(username: )") result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list)
## diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 80f727b..31c1051 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -853,7 +853,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None return result
-def fence_login(options): +def fence_login(options, re_login_string = "(login\s*: )|(Login Name: )|(username: )|(User Name :)"): force_ipvx=""
if (options.has_key("-6")): @@ -870,7 +870,6 @@ def fence_login(options): time.sleep(int(options["-f"]))
try: - re_login_string = "(login\s*: )|(Login Name: )|(username: )|(User Name :)" re_login = re.compile(re_login_string, re.IGNORECASE) re_pass = re.compile("password", re.IGNORECASE)
cluster-commits@lists.fedorahosted.org