Ensure that pbr>=0.5.10 is installed

A bug in PBR levels less than 0.5.10 causes the
/usr/lib/python2.X/site-packages/cinder/db/sqlalchemy/migrate_repo/migrate.cfg
file to not be properly installed.  This causes 'cinder-manage db sync'
to fail due to the missing file.

This change sets the required PBR level to >=0.5.10,<0.6 to avoid the problem.
In the case that user already has a 0.5.X level of PBR installed that is less
than 0.5.10 it should be updated rather than encountering issues as our
test system did.

Change-Id: I532158277a4acbb2f8cb75d03c91097e6d7e0312
fixes: bug 1182203

diff --git a/setup.py b/setup.py
index 1e9882df0ed283780991dd3eebfa1404bda89ecf..b3e85a7150c3bd1d740102d143577e76498f1ac7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
     d2to1=True)

diff --git a/tools/pip-requires b/tools/pip-requires
index 3a2357c02b106bc1e23afb305c4f5eb20150b607..5caaa29bd6e3d5714febf76152ac3aa286bb19a2 100644 (file)
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -1,5 +1,5 @@
 d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.10,<0.6
 amqplib>=0.6.1
 anyjson>=0.2.4
 argparse