Updated from global requirements

Also, revert commit 9826e09325

Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530

requirements.txt

@@ -1,28 +1,27 @@
-alembic>=0.4.1
+pbr>=0.5.21,<1.0
+
+Paste
+PasteDeploy>=1.5.0
+Routes>=1.12.3
 amqplib>=0.6.1
-anyjson>=0.2.4
+anyjson>=0.3.3
 argparse
-Babel>=0.9.6
-d2to1>=0.2.10,<0.3
-eventlet>=0.9.17
+eventlet>=0.13.0
 greenlet>=0.3.2
 httplib2
 iso8601>=0.1.4
-kombu>=1.0.4
+kombu>=2.4.8
 netaddr
+python-neutronclient>=2.2.3,<3
+pyudev
+SQLAlchemy>=0.7.8,<=0.7.99
+WebOb>=1.2.3,<1.3
+python-keystoneclient>=0.3.0
+alembic>=0.4.1
+six
+stevedore>=0.10
 
 -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3
 oslo.config>=1.2.0a3
 
-Paste
-PasteDeploy>=1.5.0
-pbr>=0.5.16,<0.6
-python-keystoneclient>=0.2.0
-python-neutronclient>=2.2.3,<3.0.0
-python-novaclient
-pyudev
-Routes>=1.12.3
-six
-sqlalchemy>=0.7.8,<=0.7.99
-stevedore>=0.9
-WebOb>=1.2
+python-novaclient>=2.12.0

setup.py

@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True)
+    setup_requires=['pbr>=0.5.21,<1.0'],
+    pbr=True)

test-requirements.txt

@@ -1,24 +1,22 @@
-cliff
+hacking>=0.5.6,<0.7
+
+Babel>=0.9.6
+cliff>=1.4
+coverage>=3.6
+discover
+fixtures>=0.3.12
+mock>=1.0
+mox>=0.5.3
+nose
+nosehtmloutput>=0.0.3
+nosexcover
+openstack.nose_plugin>=0.7
+python-subunit
+sphinx>=1.1.2
+testrepository>=0.0.17
+testtools>=0.9.32
+WebTest==1.3.3
 # Packages for the Cisco Plugin
 ###############################
 configobj
 ###############################
-coverage>=3.6
-discover
-fixtures>=0.3.12
-hacking>=0.5.3,<0.6
-mock>=1.0b1
-mox==0.5.3
-nose
-nosehtmloutput
-nosexcover
-openstack.nose_plugin
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes==0.7.2
-flake8==2.0
-python-subunit
-sphinx>=1.1.2
-testrepository>=0.0.13
-testtools>=0.9.27
-webtest==1.3.3