From 380e384f180c1b70082891f9818dc3973dd5335a Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 5 Jan 2016 19:36:42 +0100
Subject: [PATCH] Revert "Revert "Revert "Remove TEMPEST_CONFIG_DIR in the api
 tox env"""

This reverts commit be63289c273fa02159a6958e0b456d5fda217431.

Yes, it's a third order revert. Ain't it cool?

Now that tox 2.3.1 is used in gate, and it is expected to fix the issue
that we originally hacked around here, let's revert to the previous
code.

For the least, it makes API target executable locally without the need
to set TEMPEST_CONFIG_DIR in the external environment.

Also bump minimal tox version to 2.3 to avoid users hitting the old
issue with their tox 2.2.* package.

Change-Id: Ic64cb466d117ad39436cb1d079c8f5657260da2c
Related-Bug: #1515335
---
 tox.ini | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 9710cb9a521..449853bcaef 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = docs,py34,py27,pep8
-minversion = 2.0
+minversion = 2.3
 skipsdist = True
 
 [testenv]
@@ -24,9 +24,8 @@ basepython = python2.7
 passenv = {[testenv]passenv} TEMPEST_CONFIG_DIR
 setenv = {[testenv]setenv}
          OS_TEST_PATH=./neutron/tests/api
+         TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
          OS_TEST_API_WITH_REST=1
-# If you are running the tests locally you should set the env variable
-# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
 
 [testenv:api-constraints]
 basepython = {[testenv:api]basepython}