From d32e7f83fd2427f289feeb088a20165b38881235 Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Thu, 12 May 2016 08:12:58 +0100
Subject: [PATCH] Use correct var in functional test

This commit updates tests/test-tempest-functional.yml to use
tempest_ven_bin instead of assuming tempest is installing into /opt.

We also remove tempest_requirements_git_install_branch since it already
defaults to master.

Change-Id: Ib6624ae06f7cef876376c077861ce368e7289f75
---
 tests/test-tempest-functional.yml | 4 ++--
 tests/test-vars.yml               | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/test-tempest-functional.yml b/tests/test-tempest-functional.yml
index f2e82878..44f71e4c 100644
--- a/tests/test-tempest-functional.yml
+++ b/tests/test-tempest-functional.yml
@@ -20,8 +20,8 @@
   tasks:
     - name: Run tempest
       shell: |
-        . /opt/tempest_{{ tempest_git_install_branch }}/bin/activate
-        /opt/tempest_{{ tempest_git_install_branch }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} tempest.api.identity.v3
+        . {{ tempest_venv_bin }}/activate
+        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} tempest.api.identity.v3
       environment:
         RUN_TEMPEST_OPTS: "--serial"
   vars_files:
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
index a19d7cee..7342fd72 100644
--- a/tests/test-vars.yml
+++ b/tests/test-vars.yml
@@ -39,7 +39,10 @@ openrc_os_domain_name: "Default"
 openrc_os_password: "{{ keystone_auth_admin_password }}"
 tempest_developer_mode: True
 tempest_git_install_branch: master
-tempest_requirements_git_install_branch: master
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+# tempest_venv_bin is the same as the default in os_tempest role, but we set
+# it again here so we can refer to it in test-tempest-functional.yml
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
 tempest_log_dir: "/var/log/"
 tempest_main_group: keystone_all
 tempest_service_available_aodh: False
@@ -51,4 +54,3 @@ tempest_service_available_horizon: False
 tempest_service_available_neutron: False
 tempest_service_available_nova: False
 tempest_service_available_swift: False
-tempest_venv_tag: "{{ tempest_git_install_branch }}"