Merge "Fix integration tests for tox>2.0"

2015-05-14 19:09:00 +00:00 · 2015-05-14 19:09:00 +00:00 · 38e9c1f5a5
parent 27dec537fd e54dcf95fa
commit 38e9c1f5a5
1 changed files with 1 additions and 0 deletions
--- a/tox.ini
+++ b/tox.ini
@ -28,6 +28,7 @@ commands =
 [testenv:integration]
 setenv = VIRTUAL_ENV={envdir}
         TESTR_START_DIR=heat_integrationtests
+passenv = OS_*
 usedevelop = False
 deps = -r{toxinidir}/heat_integrationtests/requirements.txt
 commands =