From: Zack Cerza Date: Tue, 5 Dec 2017 23:08:45 +0000 (-0700) Subject: nuke: Power off FOG machines instead of reimaging X-Git-Tag: 1.1.0~370^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf2dcf955569e7761bd7f7312ce4662677fbed55;p=teuthology.git nuke: Power off FOG machines instead of reimaging Now that FOG is in master, we don't have to reimage on nuke. Let's shut them down - the next job will bring them up again during the reimage process. Signed-off-by: Zack Cerza --- diff --git a/teuthology/nuke/__init__.py b/teuthology/nuke/__init__.py index f172c4caf..1bc83d4fc 100644 --- a/teuthology/nuke/__init__.py +++ b/teuthology/nuke/__init__.py @@ -9,7 +9,7 @@ import yaml import teuthology from teuthology import provision -from teuthology.lock.ops import unlock_one, update_inventory +from teuthology.lock.ops import unlock_one from teuthology.lock.query import is_vm, list_locks, \ find_stale_locks, get_status from teuthology.lock.util import locked_since_seconds @@ -304,10 +304,8 @@ def nuke_helper(ctx, should_unlock): check_lock.check_lock(ctx, None, check_up=False) status = get_status(host) if status['machine_type'] in provision.fog.get_types(): - fog_obj = provision.fog.FOG( - host, status['os_type'], status['os_version']) - fog_obj.create() - update_inventory(fog_obj.remote.inventory_info) + remote = Remote(host) + remote.console.power_off() return if (not ctx.noipmi and 'ipmi_user' in config and 'vpm' not in shortname):