]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Make PhysicalConsole aware of conserver settings
authorZack Cerza <zack@redhat.com>
Tue, 23 Aug 2016 20:57:42 +0000 (14:57 -0600)
committerZack Cerza <zack@redhat.com>
Tue, 30 Aug 2016 16:47:33 +0000 (10:47 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/orchestra/console.py

index f09ec876cf4f33cec4b5053d5561f9005bd1b819..4ebce301e02e3c22e7f478939bcbdb975d7d923c 100644 (file)
@@ -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: