]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
getRemoteConsole(): look up IPMI credentials
authorZack Cerza <zack@redhat.com>
Mon, 15 Aug 2016 19:01:53 +0000 (13:01 -0600)
committerZack Cerza <zack@redhat.com>
Mon, 15 Aug 2016 19:01:53 +0000 (13:01 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/orchestra/remote.py

index cb9d6b4691f97a6ede4e36bf9c63506c76ca1a89..e15032f40586814ea302e560f8c8a2ccc40e9605 100644 (file)
@@ -16,6 +16,8 @@ import pwd
 import tempfile
 import netaddr
 
+from teuthology.config import config
+
 try:
     import libvirt
 except ImportError:
@@ -707,11 +709,14 @@ class VirtualConsole():
             s=self.shortname, i=interval))
 
 
-def getRemoteConsole(name, ipmiuser, ipmipass, ipmidomain, logfile=None,
-                     timeout=20):
+def getRemoteConsole(name, ipmiuser=None, ipmipass=None, ipmidomain=None,
+                     logfile=None, timeout=20):
     """
     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 VirtualConsole(name, ipmiuser, ipmipass, ipmidomain, logfile,
                               timeout)