From 1112a1fd3d257dddf3a4c166237e284368053beb Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Mon, 20 Oct 2014 20:00:28 +0300 Subject: [PATCH] rpm, deb specs were updated according to global requirements: python-pbr requirements were updated/added: pbr>=0.6,!=0.7,<1.0, python-keystoneclient - was removed Change-Id: Ie81310f5fd1bede5392967c9d57d1f646a3c61ef --- .gitreview | 6 ++++-- debian/control | 3 +-- rpm/SPECS/openstack-cinder.spec | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitreview b/.gitreview index a029f3a35..c7ebddf28 100644 --- a/.gitreview +++ b/.gitreview @@ -1,8 +1,10 @@ [gerrit] -host=gerrit.mirantis.com +host=review.fuel-infra.org port=29418 -project=openstack-ci/openstack/cinder-build +project=openstack-build/cinder-build defaultbranch=openstack-ci/fuel-6.0/2014.2 + + diff --git a/debian/control b/debian/control index aa9a88725..c084f55c2 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends-Indep: python-greenlet (>= 0.3.2), python-hacking, python-iso8601 (>= 0.1.9), - python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), python-kombu (>= 2.5.0), python-lxml (>= 2.3), @@ -56,6 +55,7 @@ Package: python-cinder Section: python Architecture: all Depends: + python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0), python-amqplib (>= 0.6.1), python-anyjson (>= 0.3.3), python-argparse, @@ -65,7 +65,6 @@ Depends: python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), python-greenlet (>= 0.3.2), python-iso8601 (>= 0.1.9) , - python-keystoneclient (>= 1:0.10.0), python-keystonemiddleware (>= 1.0.0), python-kombu (>= 2.5.0), python-lockfile (>= 0.8), diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index 1fef74a92..6c9e4754e 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -72,6 +72,7 @@ Requires: python-qpid Requires: python-kombu >= 2.5.0 Requires: python-amqplib +Requires: python-pbr >= 0.6.0, python-pbr < 0.7.0, python-pbr > 0.7.0, python-pbr < 1.0 Requires: python-eventlet >= 0.15.1 Requires: python-greenlet >= 0.3.2 Requires: python-iso8601 >= 0.1.9 @@ -102,7 +103,6 @@ Requires: python-oslo-i18n >= 1.0.0 Requires: python-swiftclient >= 2.2.0 Requires: python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0 -Requires: python-keystoneclient >= 1:0.10.0 Requires: python-keystonemiddleware >= 1.0.0 Requires: python-novaclient >= 1:2.18.0 -- 2.45.2