cluster-commits December 2014

cluster-commits@lists.fedorahosted.org

2 participants
34 discussions

fence-agents: master - fence_ilo_ssh: Create symlinks for fence_ilo3_ssh and fence_ilo4_ssh
by Marek Grác 01 Dec '14

01 Dec '14

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=46bd0797… Commit: 46bd07975854e3ad0b351af93d0cfc769811a81e Parent: ffee19e58c7186c88e7aba58f52ab0098d0939a7 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Dec 1 10:11:38 2014 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Dec 1 10:11:38 2014 +0100 fence_ilo_ssh: Create symlinks for fence_ilo3_ssh and fence_ilo4_ssh Resolves: rhbz#1121122 --- fence/agents/ilo_ssh/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fence/agents/ilo_ssh/Makefile.am b/fence/agents/ilo_ssh/Makefile.am index dff0e6a..34769d9 100644 --- a/fence/agents/ilo_ssh/Makefile.am +++ b/fence/agents/ilo_ssh/Makefile.am @@ -2,13 +2,15 @@ MAINTAINERCLEANFILES = Makefile.in TARGET = fence_ilo_ssh +SYMTARGET = fence_ilo3_ssh fence_ilo4_ssh + SRC = $(TARGET).py EXTRA_DIST = $(SRC) sbin_SCRIPTS = $(TARGET) -man_MANS = $(TARGET).8 +man_MANS = $(TARGET).8 $(SYMTARGET:%=%.8) FENCE_TEST_ARGS = -p test -a test -l test

1 0

fence-agents: master - fence_ilo_ssh: Change EOL to \r
by Marek Grác 01 Dec '14

01 Dec '14

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=ffee19e5… Commit: ffee19e58c7186c88e7aba58f52ab0098d0939a7 Parent: 9db6e28d381b19f2a396ea1a0f06ae4d434c0a27 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Dec 1 10:10:00 2014 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Dec 1 10:10:00 2014 +0100 fence_ilo_ssh: Change EOL to \r Previously, we have used \r\n that works fine with iLO3 with firmware >=1.50 but for iLO4 all firmware that we have tested works only with \r Resolves: rhbz#1121122 --- fence/agents/ilo_ssh/fence_ilo_ssh.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fence/agents/ilo_ssh/fence_ilo_ssh.py b/fence/agents/ilo_ssh/fence_ilo_ssh.py index 2fc9de2..7451792 100644 --- a/fence/agents/ilo_ssh/fence_ilo_ssh.py +++ b/fence/agents/ilo_ssh/fence_ilo_ssh.py @@ -59,6 +59,8 @@ device via ssh and reboot a specified outlet. " ("fence_ilo4_ssh", "Fence agent for HP iLO4 over SSH")] show_docs(options, docs) + options["eol"] = "\r" + conn = fence_login(options) conn.send_eol("SMCLP")

1 0

fence-agents: master - [fencing] Character \x00 can't be inside syslog message
by Marek Grác 01 Dec '14

01 Dec '14

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=9db6e28d… Commit: 9db6e28d381b19f2a396ea1a0f06ae4d434c0a27 Parent: d99314f845e4974bfa4868f9608f82fb52baaa5a Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Thu Nov 27 13:36:16 2014 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Nov 27 13:36:16 2014 +0100 [fencing] Character \x00 can't be inside syslog message --- fence/agents/lib/fencing.py.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 740a4e0..302bba2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -1215,5 +1215,7 @@ class SyslogLibHandler(logging.StreamHandler): }[record.levelno] msg = self.format(record) - syslog.syslog(syslog_level, msg) + + # syslos.syslog can not have 0x00 character inside or exception is thrown + syslog.syslog(syslog_level, msg.replace("\x00","\n")) return

1 0

fence-agents: master - fence_bladecenter: Simplify login process
by Marek Grác 01 Dec '14

01 Dec '14

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=d99314f8… Commit: d99314f845e4974bfa4868f9608f82fb52baaa5a Parent: 766e747471acce46b8e3a5fb77a944008ad5a452 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Wed Nov 19 15:36:06 2014 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Wed Nov 19 15:36:06 2014 +0100 fence_bladecenter: Simplify login process Previously, unique regular expression was used what could cause problems in planned autodetection of fence agents. --- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/lib/fencing.py.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 9dc71e9..314ced3 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -102,7 +102,7 @@ and uses the command line interface to power on and off blades." ## ## Operate the fencing device ###### - conn = fence_login(options, "(username: )") + conn = fence_login(options) result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list) fence_logout(conn, "exit") sys.exit(result) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 56c84da..740a4e0 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -1003,7 +1003,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list=None, return result -def fence_login(options, re_login_string=r"(login\s*: )|(Login Name: )|(username: )|(User Name :)"): +def fence_login(options, re_login_string=r"(login\s*: )|((?!Last )Login Name: )|(username: )|(User Name :)"): force_ipvx = "" if options.has_key("--inet6-only"):

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits December 2014