]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Actually call Remote.reconnect()
authorZack Cerza <zack@cerza.org>
Mon, 10 Feb 2014 23:27:06 +0000 (17:27 -0600)
committerZack Cerza <zack@cerza.org>
Thu, 20 Feb 2014 23:46:07 +0000 (17:46 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/task/devstack.py

index 29b8dad849c907d5f4983b15e5df2539daac46a1..2ed95bfd8b8bc915369b34b2c4511915e8b83263 100644 (file)
@@ -247,13 +247,13 @@ def set_apache_servername(devstack_node):
                       wait=True)
 
 
-def reboot(node, timeout=300, interval=10):
+def reboot(node, timeout=300, interval=30):
     log.info("Rebooting {host}...".format(host=node.hostname))
     node.run(args=['sudo', 'shutdown', '-r', 'now'])
     reboot_start_time = time.time()
     while time.time() - reboot_start_time < timeout:
         time.sleep(interval)
-        if node.is_online:
+        if node.is_online or node.reconnect():
             return
     raise RuntimeError(
         "{host} did not come up after reboot within {time}s".format(