From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 1 Jul 2019 18:45:27 +0000 (-0700)
Subject: teuthology/console: allow deferring login after reset
X-Git-Tag: 1.1.0~240^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1296%2Fhead;p=teuthology.git

teuthology/console: allow deferring login after reset

Fixes: http://tracker.ceph.com/issues/37681
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/teuthology/orchestra/console.py b/teuthology/orchestra/console.py
index 5a36dc654d..16a27a9df1 100644
--- a/teuthology/orchestra/console.py
+++ b/teuthology/orchestra/console.py
@@ -199,7 +199,7 @@ class PhysicalConsole():
         self._wait_for_login(timeout=timeout)
         log.info('Power cycle for {s} completed'.format(s=self.shortname))
 
-    def hard_reset(self):
+    def hard_reset(self, wait_for_login=True):
         """
         Perform physical hard reset.  Retry if EOF returned from read
         and wait for login when complete.
@@ -212,7 +212,8 @@ class PhysicalConsole():
                              timeout=self.timeout)
             if r == 0:
                 break
-        self._wait_for_login()
+        if wait_for_login:
+            self._wait_for_login()
         log.info('Hard reset for {s} completed'.format(s=self.shortname))
 
     def power_on(self):