From d69fa062f09d28154aa255b6f537766e5a370ed6 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Wed, 24 Aug 2016 09:14:38 -0600 Subject: [PATCH] console_log: Be aware of conserver Signed-off-by: Zack Cerza --- teuthology/task/console_log.py | 6 ++++-- teuthology/test/task/test_console_log.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/teuthology/task/console_log.py b/teuthology/task/console_log.py index c8ace9cc..97cf8345 100644 --- a/teuthology/task/console_log.py +++ b/teuthology/task/console_log.py @@ -28,8 +28,10 @@ class ConsoleLog(Task): if not hasattr(remote.console, 'spawn_sol_log'): log.debug("%s does not support IPMI; excluding", remote.shortname) - elif not remote.console.has_ipmi_credentials: - log.debug("IPMI credentials not found for %s; excluding", + elif not (remote.console.has_ipmi_credentials or + remote.console.has_conserver): + log.debug("Cannot find IPMI credentials or conserver settings " + "for %s; excluding", remote.shortname) else: new_cluster.add(remote, roles) diff --git a/teuthology/test/task/test_console_log.py b/teuthology/test/task/test_console_log.py index e96dee9e..b9731d47 100644 --- a/teuthology/test/task/test_console_log.py +++ b/teuthology/test/task/test_console_log.py @@ -52,6 +52,7 @@ class TestConsoleLog(TestTask): def test_has_ipmi_credentials(self): for remote in self.ctx.cluster.remotes.keys(): remote.console.has_ipmi_credentials = False + remote.console.has_conserver = False task = self.klass(self.ctx, self.task_config) assert len(task.cluster.remotes.keys()) == 0 -- 2.47.3