diff options
| author |   hongbo tian <hongbo.tianhongbo@huawei.com> | 2017-06-09 07:32:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-09 07:32:14 +0000 |
| commit | d7795dd0b6e10c335dba65f1456d43fee50c121f (patch) | |
| tree | 81cd76a85acc265336fdbc35430bb4c3c94c28f4 /dovetail/container.py | |
| parent | 2c170360711d8307ffab3fe8070a771650e4fd47 (diff) | |
| parent | 5a72ace55ede5bb798435aaa249ebe12e501258e (diff) | |
Merge "https+credential support"
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index 39062c84..dd73096d 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -172,11 +172,25 @@ class Container(object): maybe some issue with domain name resolution', hosts_config_path) + cacert_volume = "" + cacert = os.getenv('OS_CACERT',) + if cacert is not None: + if not os.path.isfile(cacert): + cls.logger.error("env variable 'OS_CACERT' is set to %s" + "but the file does not exist", cacert) + return None + elif not dovetail_config['config_dir'] in cacert: + cls.logger.error("OS_CACERT file has to be put in %s, which" + "can be mount into container", + dovetail_config['config_dir']) + return None + cacert_volume = ' -v %s:%s ' % (cacert, cacert) + result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'], dovetail_config[type]['result']['dir']) - cmd = 'sudo docker run %s %s %s %s %s %s %s %s /bin/bash' % \ - (opts, envs, config, hosts_config, openrc, config_volume, - result_volume, docker_image) + cmd = 'sudo docker run %s %s %s %s %s %s %s %s %s /bin/bash' % \ + (opts, envs, config, hosts_config, openrc, cacert_volume, + config_volume, result_volume, docker_image) dt_utils.exec_cmd(cmd, cls.logger) ret, container_id = \ dt_utils.exec_cmd("sudo docker ps | grep " + docker_image + |