summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-06-29 03:33:46 -0400
committerGeorg Kunz <georg.kunz@ericsson.com>2018-07-03 07:20:17 +0000
commit22f1f4b049736f1fa24ec3f5b7d1248c93bbb6ea (patch)
treee8db38bc056439b8706c1098e8c5593bc1a3cdcf /etc
parent64c1fc7a32b892e353c0e6a092110a9268423c7b (diff)
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>
Diffstat (limited to 'etc')
-rw-r--r--etc/conf/yardstick_config.yml6
1 files changed, 3 insertions, 3 deletions
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: