From: xudan <xudan16@huawei.com>
Date: Fri, 29 Jun 2018 07:33:46 +0000 (-0400)
Subject: Adapt Yardstick fraser
X-Git-Tag: ovp-2.0.0-rc1~42
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F59309%2F2;p=dovetail.git

Adapt Yardstick fraser

Yardstick fraser has changed from openstack python client to shade.
OS_INSECURE is not a key for shade.
It needs to be OS_VERIFY.

Change-Id: I0973853d0527b04ec371ad4f6ce2f6c67ef50ccf
Signed-off-by: xudan <xudan16@huawei.com>
---

diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index 4b32193b..8cd5d9a6 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -5,16 +5,16 @@
 {% set validate_testcase = validate_testcase or '' %}
 {% set testcase = testcase or '' %}
 {% set os_insecure = os_insecure or 'False' %}
-{% set os_cacert = '' %}
+{% set os_verify = '' %}
 {% if os_insecure == 'True' %}
-    {% set os_cacert = ' -e OS_CACERT=False ' %}
+    {% set os_verify = ' -e OS_VERIFY= ' %}
 {% endif %}
 
 yardstick:
   image_name: opnfv/yardstick
   docker_tag: stable
   opts: '-id --privileged=true'
-  envs: "{{os_cacert}} -e YARDSTICK_BRANCH=fraser"
+  envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser"
   config:
     dir: '/home/opnfv/userconfig'
   pre_condition: