Merge "Make sure we install cinder requirements during the correct tox phase" into stable/queens

tox.ini

@@ -15,8 +15,9 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=./cinder/tests/unit
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
-
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
 
 # By default stestr will set concurrency
 # to ncpu, to specify something else use