From 433127537222120963133546bc7cde6bd2786858 Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 16 Aug 2017 03:05:56 -0400 Subject: Bugfix: wrong command in function 'check_https_enabled' JIRA: DOVETAIL-482 1. In function check_https_enabled, it will use cmd "openstack catalog show identity |awk '/public/ {print $4}'" to check if it is https. 2. However, this command will not work if it is https. 3. Check https via OS_AUTH_URL rather than "openstack catalog show identity". Change-Id: If40ffa8e9b33c38123ff4b834198a8eaaedc1c9c Signed-off-by: xudan --- dovetail/utils/dovetail_utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dovetail/utils') diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py index f74da3a2..2c7ac317 100644 --- a/dovetail/utils/dovetail_utils.py +++ b/dovetail/utils/dovetail_utils.py @@ -120,10 +120,11 @@ 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}'") - ret, msg = exec_cmd(cmd, logger) - if ret == 0 and "https://" in msg: + os_auth_url = os.getenv('OS_AUTH_URL') + if os_auth_url.startswith('https'): + logger.debug("https is enabled") return True + logger.debug("https is not enabled") return False -- cgit 1.2.3-korg