From 26f5ae0d61c7a3c5212873d726a437e349df8191 Mon Sep 17 00:00:00 2001
From: John Griffith <john.griffith@solidfire.com>
Date: Mon, 24 Sep 2012 12:59:15 -0600
Subject: [PATCH] Add missing entries in setup, fix up pip-requires

setup.py still has references to nova/compute and was missing some
requires statements, and more importantly didn't hvae the install_requires.

Also, tools/pip-requires needed lxml versions set, as well as
added the missing setuptools_git entry.

This was exposed when trying to run Grenade as the requires.txt
file was never generated.

Fixes bug #1055693

Change-Id: Iaf9669d66e89507989ef3fde630dc2b488a97cfc
(cherry picked from commit 7f00d13640edac8136241e546076f2106f7bfa61)
---
 setup.py            | 10 +++++++---
 tools/pip-requires  |  7 ++++---
 tools/test-requires |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 350ce25a19..02217af8be 100644
--- a/setup.py
+++ b/setup.py
@@ -21,17 +21,20 @@
 from cinder.openstack.common import setup as common_setup
 from cinder import version
 
+requires = common_setup.parse_requirements()
+
 setuptools.setup(name='cinder',
       version=version.canonical_version_string(),
-      description='cloud computing fabric controller',
+      description='block storage service',
       author='OpenStack',
       author_email='cinder@lists.launchpad.net',
       url='http://www.openstack.org/',
       cmdclass=common_setup.get_cmdclass(),
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
+      install_requires=requires,
       include_package_data=True,
       test_suite='nose.collector',
-      setup_requires=['setuptools-git>=0.4'],
+      setup_requires=['setuptools_git>=0.4'],
       scripts=['bin/cinder-all',
                'bin/cinder-api',
                'bin/cinder-clear-rabbit-queues',
@@ -39,5 +42,6 @@
                'bin/cinder-rootwrap',
                'bin/cinder-scheduler',
                'bin/cinder-volume',
-               'bin/cinder-volume-usage-audit'],
+               'bin/cinder-volume-usage-audit',
+              ],
         py_modules=[])
diff --git a/tools/pip-requires b/tools/pip-requires
index 34538e3cf9..d45a24386c 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,10 +1,10 @@
 SQLAlchemy>=0.7.3
 amqplib==0.6.1
 anyjson==0.2.4
-eventlet
+eventlet>=0.9.17
 kombu==1.0.4
 lockfile==0.8
-lxml==2.3
+lxml>=2.3,<=2.3.5
 python-daemon==1.5.5
 routes==1.12.3
 WebOb==1.0.8
@@ -17,4 +17,5 @@ suds==0.4
 paramiko
 Babel>=0.9.6
 iso8601>=0.1.4
-python-glanceclient<2
+setuptools_git>=0.4
+python-glanceclient>=0.5.0,<2
diff --git a/tools/test-requires b/tools/test-requires
index 108e4e65f7..e23a2578b3 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -8,6 +8,6 @@ nosexcover
 openstack.nose_plugin
 nosehtmloutput
 pep8==1.1
+pylint==0.25.2
 sphinx>=1.1.2
 MySQL-python
-setuptools-git>=0.4