From: Zack Cerza <zack@redhat.com>
Date: Tue, 23 Aug 2016 20:57:42 +0000 (-0600)
Subject: Make PhysicalConsole aware of conserver settings
X-Git-Tag: 1.1.0~537^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02b17c29887d73af560d88770ef9f67f82170b99;p=teuthology.git

Make PhysicalConsole aware of conserver settings

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

diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py
index f09ec876c..4ebce301e 100644
--- a/teuthology/orchestra/console.py
+++ b/teuthology/orchestra/console.py
@@ -35,6 +35,18 @@ class PhysicalConsole():
         self.has_ipmi_credentials = all(
             [self.ipmiuser, self.ipmipass, self.ipmidomain]
         )
+        self.conserver_master = config.conserver_master
+        self.conserver_port = config.conserver_port
+        conserver_client_found = subprocess.Popen(
+            'which console',
+            shell=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT).wait() == 0
+        self.has_conserver = all([
+            self.conserver_master,
+            self.conserver_port,
+            conserver_client_found,
+        ])
 
     def _check_credentials(self):
         if not self.has_ipmi_credentials: