Updated from global requirements

Change-Id: I72045d8a7b5abbd6ad6b9a01f9a5fa653c37b464

diff --git a/requirements.txt b/requirements.txt
index 0cf1996bab74b9efd26da92019fcb9d90a356517..307d21517d98839f58c713d6b3d4961119db43ff 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,18 +16,18 @@ requests>=1.2.1,!=2.4.0
 iso8601>=0.1.9
 jsonrpclib
 Jinja2
-keystonemiddleware>=1.0.0
+keystonemiddleware>=1.0.0,<1.3
 netaddr>=0.7.12
-python-neutronclient>=2.3.6,<3
+python-neutronclient>=2.3.6,<2.4
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
 WebOb>=1.2.3
-python-keystoneclient>=0.10.0
+python-keystoneclient>=0.10.0,<0.12
 alembic>=0.6.4
 six>=1.7.0
-stevedore>=1.0.0  # Apache-2.0
-oslo.config>=1.4.0  # Apache-2.0
-oslo.db>=1.0.0  # Apache-2.0
-oslo.messaging>=1.4.0
-oslo.rootwrap>=1.3.0
+stevedore>=1.0.0,<1.2  # Apache-2.0
+oslo.config>=1.4.0,<1.5  # Apache-2.0
+oslo.db>=1.0.0,<1.2  # Apache-2.0
+oslo.messaging>=1.4.0,<1.5
+oslo.rootwrap>=1.3.0,<1.4
 
-python-novaclient>=2.18.0
+python-novaclient>=2.18.0,<2.21

diff --git a/test-requirements.txt b/test-requirements.txt
index 2943af4aae490ac644392cb66bf57b3eba503a00..9bc6ad1ef0a6c11d252a7cfdb93c8afdc6e1d9d6 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 hacking>=0.9.2,<0.10
 
-cliff>=1.7.0  # Apache-2.0
+cliff>=1.7.0,<1.9  # Apache-2.0
 coverage>=3.6
 discover
 fixtures>=0.3.14
@@ -14,5 +14,5 @@ requests-mock>=0.4.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx>=2.2.0  # Apache-2.0
 testrepository>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.34,!=1.4.0
 WebTest>=2.0