summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-07-26 01:39:44 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-26 01:39:44 +0000
commite2601afe686e29e3c6109637e43208b5c6132e74 (patch)
tree9f532d20e105a2892ebde0f2b690e7d0aad867a0
parente665345b9681ceca6b950ecbbd4e88dd1be5acda (diff)
parent969ca57ec3bb297eca0d6c65b16ec55be512ae28 (diff)
Merge "Bugfix: supoort insecure mode in checking openstack environment"
-rwxr-xr-xtests/ci/yardstick-verify7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 149eef429..16598df7b 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"