Updated from global requirements

Change-Id: I2bb0ae068bd37eddd869da0ecca5bcced2991546

diff --git a/requirements.txt b/requirements.txt
index d6f86a17041589634a89ca253802bc7ee8b2f793..d55633632814f45c22ff00e69b350c26cbfa68b3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,32 +9,32 @@ Babel>=1.3
 eventlet>=0.15.1
 greenlet>=0.3.2
 iso8601>=0.1.9
-keystonemiddleware>=1.0.0
+keystonemiddleware>=1.0.0,<1.3
 kombu>=2.5.0
 lxml>=2.3
 netaddr>=0.7.12
-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
+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
 osprofiler>=0.3.0                       # Apache-2.0
 paramiko>=1.13.0
 Paste
 PasteDeploy>=1.5.0
 pycrypto>=2.6
-python-barbicanclient>=2.1.0
-python-glanceclient>=0.14.0
-python-novaclient>=2.18.0
-python-swiftclient>=2.2.0
+python-barbicanclient>=2.1.0,!=3.0.0,<3.1
+python-glanceclient>=0.14.0,<0.15
+python-novaclient>=2.18.0,<2.21
+python-swiftclient>=2.2.0,<2.4
 requests>=1.2.1,!=2.4.0
 Routes>=1.12.3,!=2.0
-taskflow>=0.4
+taskflow>=0.4,<0.6
 rtslib-fb>=2.1.39
 six>=1.7.0
 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
 sqlalchemy-migrate>=0.9.1,!=0.9.2
-stevedore>=1.0.0  # Apache-2.0
+stevedore>=1.0.0,<1.2  # Apache-2.0
 suds>=0.4
 WebOb>=1.2.3
 wsgiref>=0.1.2
-oslo.i18n>=1.0.0  # Apache-2.0
+oslo.i18n>=1.0.0,<1.5  # Apache-2.0

diff --git a/test-requirements.txt b/test-requirements.txt
index fef0ca194b4b0c23ec048d7e7683398f622df93c..4e433d9a207a530c0f97cbcb88a9168dc6716e38 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,6 +13,6 @@ MySQL-python
 psycopg2
 sphinx>=1.1.2,!=1.2.0,<1.3
 python-subunit>=0.0.18
-testtools>=0.9.34
+testtools>=0.9.34,!=1.4.0
 testrepository>=0.0.18
 oslosphinx>=2.2.0  # Apache-2.0