Updated from global requirements and fix env variables passthrought1.3.2

Change-Id: I38c6902ae4c94e2332be300fcfb4d141700170c1

3 files changed, 10 insertions, 9 deletions

diff --git a/requirements.txt b/requirements.txt
index cf4e036..ca8291e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,11 +8,11 @@ argparse
 Babel>=1.3
 iso8601>=0.1.9
 netaddr>=0.7.12
-oslo.config>=1.9.0  # Apache-2.0
-oslo.i18n>=1.3.0  # Apache-2.0
-oslo.serialization>=1.2.0               # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
+oslo.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.i18n>=1.5.0,<1.6.0  # Apache-2.0
+oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
+oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
 PrettyTable>=0.7,<0.8
 requests>=2.2.0,!=2.4.0
 six>=1.9.0
-stevedore>=1.1.0  # Apache-2.0
+stevedore>=1.3.0,<1.4.0  # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1bbc10d..8c5e4a1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,12 +12,12 @@ lxml>=2.3
 mock>=1.0
 mox3>=0.7.0
 oauthlib>=0.6
-oslosphinx>=2.2.0  # Apache-2.0
-oslotest>=1.2.0  # Apache-2.0
+oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
+oslotest>=1.5.1,<1.6.0  # Apache-2.0
 pycrypto>=2.6
-requests-mock>=0.5.1  # Apache-2.0
+requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-tempest-lib>=0.2.0
+tempest-lib>=0.4.0,<0.5.0
 testrepository>=0.0.18
 testresources>=0.2.4
 testtools>=0.9.36,!=1.2.0
diff --git a/tox.ini b/tox.ini
index 56a4320..fef36b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,6 +32,7 @@ commands = oslo_debug_helper -t keystoneclient/tests {posargs}
 
 [testenv:functional]
 setenv = OS_TEST_PATH=./keystoneclient/tests/functional
+passenv = OS_*
 
 [flake8]
 # H405: multi line docstring summary not separated with an empty line