diff options
| author |   Tomi Juvonen <tomi.juvonen@nokia.com> | 2018-08-09 08:53:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-09 08:53:35 +0000 |
| commit | b2bb504032ac81a2ed3f404113b097d9ce3d7f14 (patch) | |
| tree | c143680facde4f2b20e0e0248e332a6b45093e5a | |
| parent | eaeb3c0f9dc9e6645a159d0a78b9fc181fce53d4 (diff) | |
| parent | 7b73fe24ce63e36dea924164c98e0a15fd1d7684 (diff) | |
Merge "bugfix: kill the stunnel when cleanup"
| -rw-r--r-- | doctor_tests/installer/base.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doctor_tests/installer/base.py b/doctor_tests/installer/base.py index f312130a..f37b7f1a 100644 --- a/doctor_tests/installer/base.py +++ b/doctor_tests/installer/base.py @@ -64,16 +64,15 @@ class BaseInstaller(object): " -o StrictHostKeyChecking=no" " -i %s %s@%s -R %s:localhost:%s" " sleep 600 > ssh_tunnel.%s" - " 2>&1 < /dev/null &" + " 2>&1 < /dev/null " % (self.key_file, self.node_user_name, node_ip, self.conf.consumer.port, self.conf.consumer.port, node_ip)) - server = subprocess.Popen(cmd, shell=True) + server = subprocess.Popen('exec ' + cmd, shell=True) self.servers.append(server) - server.communicate() def _get_ssh_key(self, client, key_path): self.log.info('Get SSH keys from %s installer......' |