From 1c7c2eb4b9c5cabdf260ceb21691b619f620e45a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 30 Jul 2014 11:12:09 -0700 Subject: [PATCH] nuke: allow nuking vpm hosts Skip the console check, though. Signed-off-by: Sage Weil --- teuthology/nuke.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/teuthology/nuke.py b/teuthology/nuke.py index 65b3f4d780..58d87b4e72 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -387,15 +387,12 @@ def nuke_one(ctx, targets, should_unlock, synch_clocks, reboot_all, def nuke_helper(ctx): # ensure node is up with ipmi - (target,) = ctx.config['targets'].keys() host = target.split('@')[-1] shortname = host.split('.')[0] - if 'vpm' in shortname: - return log.debug('shortname: %s' % shortname) log.debug('{ctx}'.format(ctx=ctx)) - if not ctx.noipmi and 'ipmi_user' in ctx.teuthology_config: + if not ctx.noipmi and 'ipmi_user' in ctx.teuthology_config and 'vpm' not in shortname: console = orchestra.remote.getRemoteConsole( name=host, ipmiuser=ctx.teuthology_config['ipmi_user'], -- 2.39.5