summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-07-13 22:03:27 -0400
committerxudan <xudan16@huawei.com>2017-07-17 05:31:31 -0400
commit2e08fbf269b31c0400489e14dd8a2538e330edf9 (patch)
treec9a0919321fe0083748049ed7158c05929a822fb
parentcc034a7135cf70f137915f8b55c8ef00ab61e96e (diff)
Delete the ERROR log when it is not https
JIRA: DOVETAIL-462 1. If it is not https, Dovetail will give a error log 2017-07-13 21:58:30,409 - container.Container - ERROR - The command 'openstack catalog show identity |awk '/public/ {print $4}'| grep 'https'' failed. 2. Remove this error log becuase it is not an error. Change-Id: I5791b1925cad8606d70eefd4940dd9bf46956305 Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/container.py2
-rw-r--r--dovetail/utils/dovetail_utils.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index 2108cdc1..2d9701bf 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -177,7 +177,7 @@ class Container(object):
cacert_volume = ""
https_enabled = dt_utils.check_https_enabled(cls.logger)
cacert = os.getenv('OS_CACERT',)
- if https_enabled == 0:
+ if https_enabled:
cls.logger.info("https enabled...")
if cacert is not None:
if not os.path.isfile(cacert):
diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py
index 8112d28d..f74da3a2 100644
--- a/dovetail/utils/dovetail_utils.py
+++ b/dovetail/utils/dovetail_utils.py
@@ -120,17 +120,18 @@ def source_env(env_file):
def check_https_enabled(logger=None):
logger.debug("Checking if https enabled or not...")
- cmd = "openstack catalog show identity |awk '/public/ {print $4}'| \
- grep 'https'"
+ cmd = ("openstack catalog show identity |awk '/public/ {print $4}'")
ret, msg = exec_cmd(cmd, logger)
- return ret
+ if ret == 0 and "https://" in msg:
+ return True
+ return False
def get_ext_net_name(env_file, logger=None):
https_enabled = check_https_enabled(logger)
insecure_option = ''
insecure = os.getenv('OS_INSECURE',)
- if https_enabled == 0:
+ if https_enabled:
logger.info("https enabled...")
if insecure.lower() == "true":
insecure_option = ' --insecure '