From e1cecea5f025b65bb07df36b5bc71775969d21a4 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 1 Oct 2019 17:05:03 +0300 Subject: [PATCH] Fix tempest source install condition Because of jinja2 templating delimiters inside when statement tempest wasn't correctly installed from source. Also condition is simplified to be more readable. install_method check works as we would like to run venv installation only for source installs, but not for the ubuntu mixed setup. Depends-On: https://review.opendev.org/686041 Change-Id: I39332a35fb2edae65a4762fe24c5b1f8c8675a2b --- tasks/tempest_install_source.yml | 6 +----- templates/tempest.conf.j2 | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tasks/tempest_install_source.yml b/tasks/tempest_install_source.yml index 98f76dbc..2afd3e1e 100644 --- a/tasks/tempest_install_source.yml +++ b/tasks/tempest_install_source.yml @@ -29,11 +29,7 @@ - section: "tempest" option: "venv_tag" value: "{{ tempest_venv_tag }}" - # Note(jrosser) this task can be conditional on tempest_plugin_install_source - # but then that variable must be in scope when the handler inside python_venv_build - # runs, so it is better to duplicate the underlying condition logic - # when: not tempest_plugin_install_source - when: not "{{ ((tempest_install_method | default('source') == 'distro') and (ansible_os_family | lower == 'debian')) | bool }}" + when: tempest_install_method | default('source') == 'source' - name: Get tempest plugins from git git: diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2 index 7e7eb088..a8467345 100644 --- a/templates/tempest.conf.j2 +++ b/templates/tempest.conf.j2 @@ -67,7 +67,8 @@ admin_role = admin [identity-feature-enabled] -trust = false +trust = true +application_credentials = true [image]