From c6808815e15c836d097c4ae5ec5e2ecc83793ae8 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Fri, 11 Aug 2017 20:11:14 +0530 Subject: [PATCH] Switch to overcloudrc.v3 for running tempest * Since Identity V2 api is deprecated since Mitaka, So we can switch to Identity V3 api from pike onwards. We donot want to break Newton and Ocata jobs so keep v2 for them. * Since mistral does not work with Identity v3 api so keep v2 for mistral. * Collect overcloudrc.v3 file. Change-Id: If66fc4df8d16bbbae45ac5f4bb643c62fff0f21e --- roles/collect-logs/defaults/main.yml | 2 +- roles/validate-tempest/templates/configure-tempest.sh.j2 | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/collect-logs/defaults/main.yml b/roles/collect-logs/defaults/main.yml index 22eb25358..27c7d24a1 100644 --- a/roles/collect-logs/defaults/main.yml +++ b/roles/collect-logs/defaults/main.yml @@ -10,7 +10,7 @@ artcl_collect_list: - /etc/ - /home/*/.instack/install-undercloud.log - /home/*/stackrc - - /home/*/overcloudrc + - /home/*/overcloudrc* - /home/*/*.log - /home/*/*.json - /home/*/*.conf diff --git a/roles/validate-tempest/templates/configure-tempest.sh.j2 b/roles/validate-tempest/templates/configure-tempest.sh.j2 index 8bec70868..29c07c669 100644 --- a/roles/validate-tempest/templates/configure-tempest.sh.j2 +++ b/roles/validate-tempest/templates/configure-tempest.sh.j2 @@ -5,7 +5,14 @@ {% if tempest_overcloud|bool %} ## :: +{% if release in ['newton', 'ocata'] or 'mistral' in tempest_plugins %} +# Currently mistral does not works with Identity V3 api +# FIXME(chkumar): https://bugs.launchpad.net/tripleo/+bug/1711083 +# Tracking bug for the same. source {{ working_dir }}/overcloudrc +{% else %} +source {{ working_dir }}/overcloudrc.v3 +{% endif %} ## * Clean up from any previous tempest run ## ::