diff options
Diffstat (limited to 'qtip/util/env.py')
| -rw-r--r-- | qtip/util/env.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qtip/util/env.py b/qtip/util/env.py index 830c9b38..ffa56ae4 100644 --- a/qtip/util/env.py +++ b/qtip/util/env.py @@ -18,7 +18,7 @@ import paramiko from qtip.util.logger import QtipLogger -logger = QtipLogger('ansible_driver').get +logger = QtipLogger('env').get SCRIPT_DIR = path.join(path.dirname(__file__), path.pardir, 'scripts') KEYNAME = 'QtipKey' @@ -191,14 +191,18 @@ class AnsibleEnvSetup(object): return False def cleanup(self): - IF_DEBUG = os.getenv('IF_DEBUG') + CI_DEBUG = os.getenv('CI_DEBUG') - if IF_DEBUG: + if CI_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)) + cmd = 'bash {0}/cleanup_creds.sh {1} {2}'.format( + SCRIPT_DIR, ip, self.keypair['private']) + os.system(cmd) + + logger.info("Cleanup hostfile and keypair.") + clean_file(self.hostfile, + self.keypair['private'], + self.keypair['public']) |