From 62d00c20476d8e25974c2f78ec9c2bd05d8f2412 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Sat, 22 Oct 2016 11:58:03 +0800 Subject: Remove Qtip private key files in repos 1. Automaticly genegrate private key files. 2. remove the key files in repo at last. 3. remove public key from authorized_keys of compute hosts. JIRA: QTIP-110 Change-Id: Ie22f3f195edf650e690a2ed69df1af191953068f Signed-off-by: wu.zhihui --- func/args_handler.py | 10 ++++++---- func/env_setup.py | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'func') diff --git a/func/args_handler.py b/func/args_handler.py index 59712800..582a24b1 100644 --- a/func/args_handler.py +++ b/func/args_handler.py @@ -59,10 +59,12 @@ def prepare_ansible_env(benchmark_test_case): def run_benchmark(installer_type, pwd, benchmark, benchmark_details, proxy_info, env_setup, benchmark_test_case): driver = Driver() - return driver.drive_bench(installer_type, pwd, benchmark, - env_setup.roles_dict.items(), - _get_f_name(benchmark_test_case), - benchmark_details, env_setup.ip_pw_dict.items(), proxy_info) + result = driver.drive_bench(installer_type, pwd, benchmark, + env_setup.roles_dict.items(), + _get_f_name(benchmark_test_case), + benchmark_details, env_setup.ip_pw_dict.items(), proxy_info) + env_setup.cleanup_authorized_keys() + return result def prepare_and_run_benchmark(installer_type, pwd, benchmark_test_case): diff --git a/func/env_setup.py b/func/env_setup.py index 9e21a5b6..6027f904 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -208,3 +208,9 @@ class Env_setup: def call_ssh_test(self): self.ssh_test(self.ip_pw_list) + + def cleanup_authorized_keys(self): + for ip, pw in self.ip_pw_list: + cmd = './scripts/cleanup_creds.sh %s' % ip + logger.info("cleanup authorized_keys: %s " % cmd) + os.system(cmd) -- cgit 1.2.3-korg