diff options
author | wu.zhihui <wu.zhihui1@zte.com.cn> | 2017-03-11 10:19:21 +0800 |
---|---|---|
committer | zhihui wu <zhihui.wu2006+zte@gmail.com> | 2017-03-11 04:40:16 +0000 |
commit | 855ac41c1220daf85717bb48ce2d4d2828109aa5 (patch) | |
tree | c856652fad879f5719b79efaa8b25136ab890025 | |
parent | c5f64d5114be98cbe6a74c2078b22b741ae984a4 (diff) |
env cleanup
If IF_DEBUG is True, there is not cleanup step.
If IF_DEBUG is False, host file and keypair will be
deleted on local and public key will be removed from
remote nodes in the end of test.
Change-Id: I4a88acc2d428e41e4abaedacb011e27468b2cb57
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
(cherry picked from commit d37dad746e504e833abcf2ae058f2b81e2a9d365)
-rwxr-xr-x | qtip/scripts/cleanup_creds.sh | 11 | ||||
-rw-r--r-- | qtip/util/env.py | 17 |
2 files changed, 28 insertions, 0 deletions
diff --git a/qtip/scripts/cleanup_creds.sh b/qtip/scripts/cleanup_creds.sh new file mode 100755 index 00000000..b4eee924 --- /dev/null +++ b/qtip/scripts/cleanup_creds.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +DEST_IP=$1 +HOSTNAME=$(hostname) +sshoptions="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" + +case "$INSTALLER_TYPE" in + fuel) + ssh $sshoptions -i ./config/QtipKey root@$DEST_IP "sed -i '/root@$HOSTNAME/d' /root/.ssh/authorized_keys" + ;; +esac diff --git a/qtip/util/env.py b/qtip/util/env.py index 24e08658..830c9b38 100644 --- a/qtip/util/env.py +++ b/qtip/util/env.py @@ -16,6 +16,10 @@ import time import paramiko +from qtip.util.logger import QtipLogger + +logger = QtipLogger('ansible_driver').get + SCRIPT_DIR = path.join(path.dirname(__file__), path.pardir, 'scripts') KEYNAME = 'QtipKey' PRIVATE_KEY = '{0}/qtip/{1}'.format(os.environ['HOME'], KEYNAME) @@ -185,3 +189,16 @@ class AnsibleEnvSetup(object): return False time.sleep(2) return False + + def cleanup(self): + IF_DEBUG = os.getenv('IF_DEBUG') + + if IF_DEBUG: + logger.info("DEBUG Mode: please do cleanup by manual.") + else: + logger.info("Cleanup hostfile and keypair.") + clean_file(self.hostfile, self.keypair, self.keypair + '.pub') + + for ip in self.host_ip_list: + logger.info("Cleanup authorized_keys from {0}...".format(ip)) + os.system('bash %s/cleanup_creds.sh {0}'.format(ip)) |