Merge "Remove SSL workaround as tempestconf got fixed"

This commit is contained in:
Zuul 2020-12-18 01:15:58 +00:00 committed by Gerrit Code Review
commit 05461ccfb6

View File

@ -7,10 +7,6 @@
- hosts: tempest - hosts: tempest
vars: vars:
devstack_base_dir: "/opt/stack" devstack_base_dir: "/opt/stack"
# TODO(mkopec) set_auth_url override is needed here until the role uses
# python-tempestconf version which contains a fix for the SSL support:
# https://review.opendev.org/c/osf/python-tempestconf/+/762923
set_auth_url: "OS_AUTH_URL=$SERVICE_PROTOCOL://$SERVICE_HOST/identity/v3"
tasks: tasks:
# NOTE: devstack jobs are failing on Run Tempest task # NOTE: devstack jobs are failing on Run Tempest task
# it is because tox command is not found. Adding 'ensure-tox' # it is because tox command is not found. Adding 'ensure-tox'
@ -32,6 +28,6 @@
# location, python-tempestconf is in the same org (osf) so it's cloned # location, python-tempestconf is in the same org (osf) so it's cloned
# just one level up by the zuul # just one level up by the zuul
tempestconf_source: "../python-tempestconf" tempestconf_source: "../python-tempestconf"
source_credentials: "{{ devstack_base_dir }}/devstack/openrc demo demo; {{ set_auth_url }}" source_credentials: "{{ devstack_base_dir }}/devstack/openrc demo demo"
source_admin_credentials: "{{ devstack_base_dir }}/devstack/openrc admin admin; {{ set_auth_url }}" source_admin_credentials: "{{ devstack_base_dir }}/devstack/openrc admin admin"
additional_tempestconf_params: "auth.tempest_roles Member object-storage.operator_role Member" additional_tempestconf_params: "auth.tempest_roles Member object-storage.operator_role Member"