summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2016-12-22 05:46:10 +0000
committerxudan <xudan16@huawei.com>2016-12-22 05:46:10 +0000
commit814683870c428a983cc0259ce7b7bec162635bfe (patch)
tree08d719f429b045fc831eefab86d125de2322549a
parent1124a453feb24308f58bda363c229f632cafd82f (diff)
dovetail tool: bugfix functest prepare_env fail
JIRA: DOVETAIL-169 Change-Id: I7ede8713c16b084255f691505a39db122fdbe8ea Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/container.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index 59fc0d8a..c539ad3f 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -7,6 +7,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
#
+import os
import utils.dovetail_logger as dt_logger
import utils.dovetail_utils as dt_utils
@@ -46,8 +47,13 @@ class Container:
docker_image = cls.get_docker_image(type)
envs = dovetail_config[type]['envs']
opts = dovetail_config[type]['opts']
- creds = ' -v %s:%s ' % (dovetail_config['creds'],
- dovetail_config[type]['creds'])
+
+ # if file openstack.creds doesn't exist, creds need to be empty
+ if os.path.isfile(dovetail_config['creds']):
+ creds = ' -v %s:%s ' % (dovetail_config['creds'],
+ dovetail_config[type]['creds'])
+ else:
+ creds = ''
result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'],
dovetail_config[type]['result']['dir'])
cmd = 'sudo docker run %s %s %s %s %s %s /bin/bash' % \