diff options
| author |   wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-10-22 11:58:03 +0800 |
|---|---|---|
| committer | wu.zhihui <wu.zhihui1@zte.com.cn> | 2016-10-25 12:43:56 +0800 |
| commit | 62d00c20476d8e25974c2f78ec9c2bd05d8f2412 (patch) | |
| tree | aa1ad21387f45aeb12dcf39bd8f0f295e672530b /func | |
| parent | 36f6aa40ca02ef9ef1d24e61af337a960b8a76cd (diff) | |
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 <wu.zhihui1@zte.com.cn>
Diffstat (limited to 'func')
| -rw-r--r-- | func/args_handler.py | 10 | ||||
| -rw-r--r-- | func/env_setup.py | 6 |
2 files changed, 12 insertions, 4 deletions
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) |