A create_if_vm call was made more than once when a lock-many style lock

was performed.  This caused downburst to run twice, and the second
downburst fails as a result of the first downburst running.

Fixes: 6933

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index f13f2012379bfb2f0892d41caea7982a9cc2cfa5..230971a2eb35b9becb2f9fa8622b4b15363b401d 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -91,7 +91,7 @@ def lock_machines(ctx, config):
         if len(newly_locked) == how_many:
             vmlist = []
             for lmach in newly_locked:
-                if lock.create_if_vm(ctx, lmach):
+                if teuthology.is_vm(lmach):
                     vmlist.append(lmach)
             if vmlist:
                 log.info('Waiting for virtual machines to come up')