From 2d15e61db4da77917afd84a429eff5e68d7761a7 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 15 Feb 2018 13:08:05 -0800 Subject: [PATCH] skip specific os_type/os_version request when FOG reimage in place Signed-off-by: Vasu Kulkarni --- teuthology/lock/ops.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py index e6815d783..fa1b69af0 100644 --- a/teuthology/lock/ops.py +++ b/teuthology/lock/ops.py @@ -80,11 +80,19 @@ 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() + # backup os_type/os_version to be restored after machine lock + # with FOG we dont need to request specific os_type/os_version + if os_type: + os_type_bu = os_type + os_type = None + if os_version: + os_version_bu = os_version + os_version = None if machine_type not in vm_types: - if os_type: - data['os_type'] = os_type - if os_version: - data['os_version'] = os_version + if os_type_bu: + data['os_type'] = os_type_bu + if os_version_bu: + data['os_version'] = os_version_bu if arch: data['arch'] = arch log.debug("lock_many request: %s", repr(data)) @@ -110,6 +118,11 @@ def lock_many(ctx, num, machine_type, user=None, description=None, ok_machs = keys.do_update_keys(ok_machs.keys())[1] return ok_machs else: + # restore os_type/os_version after machine lock + if os_type_bu: + os_type = os_type_bu + if os_version_bu: + os_version = os_version_bu reimaged = dict() console_log_conf = dict( logfile_name='{shortname}_reimage.log', -- 2.47.3