From 1fe13eec3f4fcc0c63555364b41db06bffb9978c Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Tue, 27 Jun 2017 00:14:24 -0400 Subject: 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 --- dovetail/utils/dovetail_utils.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'dovetail/utils/dovetail_utils.py') diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py index e4284ad4..aeb8ea00 100644 --- a/dovetail/utils/dovetail_utils.py +++ b/dovetail/utils/dovetail_utils.py @@ -118,14 +118,25 @@ def source_env(env_file): os.environ.update({match[0]: match[1]}) +def check_https_enabled(logger=None): + logger.info("checking if https enabled or not...") + cmd = "openstack catalog show identity |awk '/public/ {print $4}'| \ + grep 'https'" + ret, msg = exec_cmd(cmd, logger) + return ret + + def get_ext_net_name(env_file, logger=None): + https_enabled = check_https_enabled(logger) insecure_option = '' insecure = os.getenv('OS_INSECURE',) - if insecure == "true" or insecure == "True": - insecure_option = ' --insecure ' - else: - print "Warn: env variable OS_INSECUE is %s, if https+no credential \ - used, it should be set as true" % insecure + if https_enabled == 0: + logger.info("https enabled...") + if insecure.lower() == "true": + insecure_option = ' --insecure ' + else: + logger.warn("env variable OS_INSECURE is %s, if https + no" + "credential used, should be set as True" % insecure) cmd_check = "openstack %s network list" % insecure_option ret, msg = exec_cmd(cmd_check, logger) -- cgit 1.2.3-korg