From: JingLu5 <lvjing5@huawei.com>
Date: Tue, 25 Jul 2017 03:21:30 +0000 (+0000)
Subject: Bugfix: supoort insecure mode in checking openstack environment
X-Git-Tag: opnfv-5.0.RC1~338^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F38043%2F3;p=yardstick.git

Bugfix: supoort insecure mode in checking openstack environment

Change-Id: I18346aa177689bc995eb7d4883f4a66383e827ba
Signed-off-by: JingLu5 <lvjing5@huawei.com>
---

diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 751cf65f3..90854d46d 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -293,8 +293,13 @@ main()
     echo
 
     # check OpenStack services
+    if [[ $OS_INSECURE ]] && [[ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
+        SECURE="--insecure"
+    else
+        SECURE=""
+    fi
     echo "Checking OpenStack services:"
-    for cmd in "openstack image list" "openstack server list" "openstack stack list"; do
+    for cmd in "openstack ${SECURE} image list" "openstack ${SECURE} server list" "openstack ${SECURE} stack list"; do
         echo "  checking ${cmd} ..."
         if ! $cmd >/dev/null; then
             echo "error: command \"$cmd\" failed"