diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-06-27 00:14:24 -0400 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2017-06-27 08:11:55 -0400 |
| commit | 1fe13eec3f4fcc0c63555364b41db06bffb9978c (patch) | |
| tree | cb5f6c069775a27a6eb02195fb5ad9f1e8bc8cca /dovetail/container.py | |
| parent | 2a4e39ee4abdbbadf1285a75fb5540a09432b5f4 (diff) | |
https enabled checking
JIRA: DOVETAIL-456
before to check OS_CACERT and OS_INSECURE when using
https + credential or + no credential,
there's a need to check if https enabled.
error log
https://build.opnfv.org/ci/view/dovetail/job/dovetail-fuel-baremetal-proposed_tests-danube/37/console
Change-Id: Icdf17541fe6cf64b2f000d424c8d4dcc28cfd371
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index a1e213d8..9f624f36 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -173,18 +173,24 @@ class Container(object): hosts_config_path) cacert_volume = "" + https_enabled = dt_utils.check_https_enabled(cls.logger) 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) + if https_enabled == 0: + cls.logger.info("https enabled...") + 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("credential 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) + else: + cls.logger.warn("https enabled, OS_CACERT not set, insecure" + "connection used or OS_CACERT missed") result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'], dovetail_config[type]['result']['dir']) |