From: Zack Cerza Date: Tue, 2 Jun 2015 21:48:33 +0000 (-0600) Subject: nuke_one(): remove confusing pluralization X-Git-Tag: 1.1.0~923^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a6464f284fea1fca9320cfefb928f9824936ef6;p=teuthology.git nuke_one(): remove confusing pluralization Signed-off-by: Zack Cerza --- diff --git a/teuthology/nuke.py b/teuthology/nuke.py index bf76bc75e..98493664c 100644 --- a/teuthology/nuke.py +++ b/teuthology/nuke.py @@ -442,11 +442,11 @@ def nuke(ctx, should_unlock, sync_clocks=True, reboot_all=True, noipmi=False): default_flow_style=False).splitlines())) -def nuke_one(ctx, targets, should_unlock, synch_clocks, reboot_all, +def nuke_one(ctx, target, should_unlock, synch_clocks, reboot_all, check_locks, noipmi): ret = None ctx = argparse.Namespace( - config=dict(targets=targets), + config=dict(targets=target), owner=ctx.owner, check_locks=check_locks, synch_clocks=synch_clocks, @@ -458,13 +458,12 @@ def nuke_one(ctx, targets, should_unlock, synch_clocks, reboot_all, try: nuke_helper(ctx, should_unlock) except Exception: - log.exception('Could not nuke all targets in %s' % targets) + log.exception('Could not nuke %s' % target) # not re-raising the so that parallel calls aren't killed - ret = targets + ret = target else: if should_unlock: - for target in targets.keys(): - unlock_one(ctx, target, ctx.owner) + unlock_one(ctx, target.keys()[0], ctx.owner) return ret