diff --git a/teuthology/lock/cli.py b/teuthology/lock/cli.py index e5f97fb63..ed4f28bd5 100644 --- a/teuthology/lock/cli.py +++ b/teuthology/lock/cli.py @@ -178,12 +178,14 @@ def main(ctx): # Update keys last updatekeys_machines = list() else: - machines_to_update.append(machine) ops.update_nodes([machine], True) - teuthology.provision.create_if_vm( + created = teuthology.provision.create_if_vm( ctx, misc.canonicalize_hostname(machine), ) + # do not try to update inventory if failed to create vm + if created: + machines_to_update.append(machine) with teuthology.parallel.parallel() as p: ops.update_nodes(reimage_machines, True) for machine in reimage_machines: diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py index fbb7fb6fb..52dce6857 100644 --- a/teuthology/lock/ops.py +++ b/teuthology/lock/ops.py @@ -445,7 +445,6 @@ def block_and_lock_machines(ctx, total_requested, machine_type, reimage=True, tr loopcount += 1 time.sleep(10) keys_dict = misc.ssh_keyscan(vmlist) - log.info('virtual machine is still unavailable') if loopcount == 40: loopcount = 0 log.info('virtual machine(s) still not up, ' + diff --git a/teuthology/provision/downburst.py b/teuthology/provision/downburst.py index 97a511ef9..7dac58efc 100644 --- a/teuthology/provision/downburst.py +++ b/teuthology/provision/downburst.py @@ -107,8 +107,9 @@ def create(self): self.destroy() else: success = False - log.info("Downburst failed on %s: %s" % ( - self.name, stderr.strip())) + log.error("Downburst failed on %s" % self.name) + for i in stderr.split('\n'): + log.error(f">>> {i}") break return success