nuke: allow nuking vpm hosts

Skip the console check, though.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/teuthology/nuke.py b/teuthology/nuke.py
index 65b3f4d78003aa1ba6f5c99e209001acd43af536..58d87b4e72feeb7da5ab9725896ea699afd6f117 100644 (file)
--- 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'],