From: Vasu Kulkarni <vasu@redhat.com>
Date: Wed, 14 Feb 2018 17:33:01 +0000 (-0800)
Subject: Enable FOG reimage by default for all machine types
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ec0fff8e23029fac41cfbcad10647888f72afe12;p=teuthology.git

Enable FOG reimage by default for all machine types

the downside: you can't control from teuthology.yaml what
machines can be enabled for FOG

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py
index 502297f454..e6815d7833 100644
--- a/teuthology/lock/ops.py
+++ b/teuthology/lock/ops.py
@@ -80,8 +80,7 @@ def lock_many(ctx, num, machine_type, user=None, description=None,
         # Only query for os_type/os_version if non-vps and non-libcloud, since
         # in that case we just create them.
         vm_types = ['vps'] + teuthology.provision.cloud.get_types()
-        reimage_types = teuthology.provision.fog.get_types()
-        if machine_type not in vm_types + reimage_types:
+        if machine_type not in vm_types:
             if os_type:
                 data['os_type'] = os_type
             if os_version:
@@ -110,7 +109,7 @@ def lock_many(ctx, num, machine_type, user=None, description=None,
                         unlock_one(ctx, machine, user)
                     ok_machs = keys.do_update_keys(ok_machs.keys())[1]
                 return ok_machs
-            elif machine_type in reimage_types:
+            else:
                 reimaged = dict()
                 console_log_conf = dict(
                     logfile_name='{shortname}_reimage.log',