diff options
Diffstat (limited to 'dovetail/utils')
| -rw-r--r-- | dovetail/utils/dovetail_utils.py | 9 | ||||
| -rwxr-xr-x | dovetail/utils/local_db/launch_db.sh | 4 | ||||
| -rwxr-xr-x | dovetail/utils/local_db/restart_db.sh | 2 | ||||
| -rw-r--r-- | dovetail/utils/offline/config.yaml | 6 |
4 files changed, 11 insertions, 10 deletions
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 ' diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh index e31f47ce..722dc227 100755 --- a/dovetail/utils/local_db/launch_db.sh +++ b/dovetail/utils/local_db/launch_db.sh @@ -59,8 +59,8 @@ echo "Create the testapi service." echo "==========================" set +e -# pull image opnfv/testapi:cvp.0.2.0 -testapi_img="opnfv/testapi:cvp.0.2.0" +# pull image opnfv/testapi:cvp.0.3.0 +testapi_img="opnfv/testapi:cvp.0.3.0" echo "Step1: pull the image $testapi_img." sudo docker pull $testapi_img set -e diff --git a/dovetail/utils/local_db/restart_db.sh b/dovetail/utils/local_db/restart_db.sh index 5d6b9b68..35096b99 100755 --- a/dovetail/utils/local_db/restart_db.sh +++ b/dovetail/utils/local_db/restart_db.sh @@ -26,4 +26,4 @@ export db_host_ip=${db_host_ip:-"$1"} sudo docker rm -f testapi sudo docker run -itd -p $testapi_port:8000 --name testapi \ - -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.2.0 + -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.3.0 diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml index edb8a5b8..11134dd1 100644 --- a/dovetail/utils/offline/config.yaml +++ b/dovetail/utils/offline/config.yaml @@ -2,7 +2,7 @@ docker_images: dovetail: domain: opnfv - tag: cvp.0.2.0 + tag: cvp.0.3.0 store_name: image_dovetail.docker functest: domain: opnfv @@ -10,11 +10,11 @@ docker_images: store_name: image_functest.docker yardstick: domain: opnfv - tag: danube.3.0 + tag: danube.3.1 store_name: image_yardstick.docker testapi: domain: opnfv - tag: cvp.0.2.0 + tag: cvp.0.3.0 store_name: image_testapi.docker mongo: tag: 3.2.1 |