From 454fea6d7301748a4ae0f353f0c0a7af9be331b1 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 11 Feb 2021 22:59:52 +0000 Subject: [PATCH] nuke: only use keep_logs from the cli nuke() is called outside of the cli with a ctx that does not include all the cli args. Use a default parameter for the functions instead of ctx. Signed-off-by: Josh Durgin --- teuthology/nuke/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/teuthology/nuke/__init__.py b/teuthology/nuke/__init__.py index 91b9f35dc..f9ea1ca04 100644 --- a/teuthology/nuke/__init__.py +++ b/teuthology/nuke/__init__.py @@ -232,10 +232,10 @@ def main(args): else: subprocess.check_call(["kill", "-9", str(ctx.pid)]) - nuke(ctx, ctx.unlock, ctx.synch_clocks, ctx.noipmi) + nuke(ctx, ctx.unlock, ctx.synch_clocks, ctx.noipmi, ctx.keep_logs) -def nuke(ctx, should_unlock, sync_clocks=True, noipmi=False): +def nuke(ctx, should_unlock, sync_clocks=True, noipmi=False, keep_logs=False): if 'targets' not in ctx.config: return total_unnuked = {} @@ -262,6 +262,7 @@ def nuke(ctx, should_unlock, sync_clocks=True, noipmi=False): sync_clocks, ctx.config.get('check-locks', True), noipmi, + keep_logs, ) for unnuked in p: if unnuked: @@ -275,9 +276,8 @@ def nuke(ctx, should_unlock, sync_clocks=True, noipmi=False): def nuke_one(ctx, target, should_unlock, synch_clocks, - check_locks, noipmi): + check_locks, noipmi, keep_logs): ret = None - keep_logs = ctx.keep_logs should_reboot = not ctx.no_reboot ctx = argparse.Namespace( config=dict(targets=target), -- 2.47.3