Move ipmi credential storage to PhysicalConsole

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

diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py
index 7ccd03e2751ce9485f06ff5ac3d84bd62368c83e..130962d528d6f6e7aaa2803f12ca0d8c4958e114 100644 (file)
--- a/teuthology/orchestra/console.py
+++ b/teuthology/orchestra/console.py
@@ -3,6 +3,7 @@ import pexpect
 import time
 
 from teuthology import lockstatus as ls
+from teuthology.config import config
 
 from ..exceptions import ConsoleError
 
@@ -26,16 +27,19 @@ class PhysicalConsole():
         self.shortname = remote.getShortName(name)
         self.timeout = timeout
         self.logfile = None
-        self.ipmiuser = ipmiuser
-        self.ipmipass = ipmipass
-        self.ipmidomain = ipmidomain
+        self.ipmiuser = ipmiuser or config.ipmi_user
+        self.ipmipass = ipmipass or config.ipmi_password
+        self.ipmidomain = ipmidomain or config.ipmi_domain
 
     def _pexpect_spawn(self, cmd):
         """
         Run the cmd specified using ipmitool.
         """
         if not self.ipmiuser or not self.ipmipass or not self.ipmidomain:
-            log.error('Must set ipmi_user, ipmi_password, and ipmi_domain in .teuthology.yaml')  # noqa
+            log.error(
+                "Must set ipmi_user, ipmi_password, and ipmi_domain in " \
+                ".teuthology.yaml"
+            )
         full_command = self._build_command(cmd)
         log.debug('pexpect command: %s', full_command)
         child = pexpect.spawn(
@@ -210,7 +214,7 @@ class VirtualConsole():
     """
     Virtual Console (set from getRemoteConsole)
     """
-    def __init__(self, name, ipmiuser, ipmipass, ipmidomain, logfile=None):
+    def __init__(self, name):
         if libvirt is None:
             raise RuntimeError("libvirt not found")
 

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index 33f6aa2d51dd9886ea4c5dc86d7c37f7802f8a27..52cf6c04b89093756478bd589beb65d7d7fbcfe0 100644 (file)
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -15,8 +15,6 @@ import pwd
 import tempfile
 import netaddr
 
-from teuthology.config import config
-
 from . import console
 
 log = logging.getLogger(__name__)
@@ -447,11 +445,7 @@ def getRemoteConsole(name, ipmiuser=None, ipmipass=None, ipmidomain=None,
     """
     Return either VirtualConsole or PhysicalConsole depending on name.
     """
-    ipmiuser = ipmiuser or config.ipmi_user
-    ipmipass = ipmipass or config.ipmi_password
-    ipmidomain = ipmidomain or config.ipmi_domain
     if misc.is_vm(name):
-        return console.VirtualConsole(
-            name, ipmiuser, ipmipass, ipmidomain, logfile)
+        return console.VirtualConsole(name)
     return console.PhysicalConsole(
         name, ipmiuser, ipmipass, ipmidomain, logfile, timeout)