From: Zack Cerza <zack@redhat.com>
Date: Wed, 24 Aug 2016 15:14:38 +0000 (-0600)
Subject: console_log: Be aware of conserver
X-Git-Tag: 1.1.0~537^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d69fa062f09d28154aa255b6f537766e5a370ed6;p=teuthology.git

console_log: Be aware of conserver

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/task/console_log.py b/teuthology/task/console_log.py
index c8ace9cc4..97cf83450 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 e96dee9e2..b9731d47e 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