Updated from global requirements

Change-Id: I65b14616d1ce28438a98ebb2601d47067628d85b

requirements.txt

@@ -11,7 +11,7 @@ decorator>=3.4.0,<=3.4.0
 eventlet>=0.15.1,<=0.15.2
 Jinja2<=2.7.2
 keystonemiddleware>=1.0.0,<1.4.0
-kombu==3.0.7
+kombu>=2.5.0,<=3.0.7
 lxml>=2.3,<=3.3.3
 Routes>=1.12.3,!=2.0,<=2.1
 WebOb>=1.2.3,<=1.3.1

test-requirements.txt

@@ -4,14 +4,14 @@
 
 hacking>=0.9.2,<0.10
 coverage>=3.6,<=3.7.1
-discover
+discover<=0.4.0
 feedparser<=5.1.3
 fixtures>=0.3.14,<=1.0.0
 libvirt-python>=1.2.5                   # LGPLv2+
-mock>=1.0
+mock>=1.0,<=1.0.1
 mox>=0.5.3,<=0.5.3
 MySQL-python<=1.2.3
-psycopg2
+psycopg2<=2.6
 pylint==0.25.2
 python-ironicclient>=0.2.1,<=0.3.3
 python-subunit>=0.0.18,<=1.0.0