From: Zack Cerza <zack@redhat.com>
Date: Mon, 15 Aug 2016 19:01:53 +0000 (-0600)
Subject: getRemoteConsole(): look up IPMI credentials
X-Git-Tag: 1.1.0~548^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a795f37c31b18e17e0fae4560dff77849a66dfac;p=teuthology.git

getRemoteConsole(): look up IPMI credentials

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

diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py
index cb9d6b469..e15032f40 100644
--- a/teuthology/orchestra/remote.py
+++ b/teuthology/orchestra/remote.py
@@ -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)