summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongbo tian <hongbo.tianhongbo@huawei.com>2016-12-07 13:53:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-07 13:53:00 +0000
commit07cd2b8ea48b8a257eab4e3cc2f4e4fe488456be (patch)
treef953658687877d34ba8fe78cd2d7bd7f4c9348c7
parentaa6e0b06aa404557bfe653746bc7c3f62a81f705 (diff)
parent6bb2c9a96a2084fc08019d1b2bff16f8a1ecc66d (diff)
Merge "Copy the jumphost ssh key into the container"
-rw-r--r--dovetail/container.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index 2716a089..a0cdf657 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -41,12 +41,11 @@ class Container:
@classmethod
def create(cls, type):
- # sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa "
+ sshkey = "-v /root/.ssh/id_rsa:/root/.ssh/id_rsa "
dovetail_config = dt_config.dovetail_config
docker_image = cls.get_docker_image(type)
envs = dovetail_config[type]['envs']
opts = dovetail_config[type]['opts']
- sshkey = ''
result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'],
dovetail_config[type]['result']['dir'])
cmd = 'sudo docker run %s %s %s %s %s /bin/bash' % \