X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-cinder.spec;h=8c7968d2601700656b52592b0fa66d8cf706318d;hb=20ddce276384d78bc6b9a0bf52394536392c3c9c;hp=f32ac6139a83714d5548ea1edbbabd3588714746;hpb=a44e54f519d45861e2b4e401a77c224f200fc875;p=openstack-build%2Fcinder-build.git

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index f32ac6139..8c7968d26 100644
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -17,6 +17,8 @@ Source10:         openstack-cinder-api.init
 Source11:         openstack-cinder-scheduler.init
 Source12:         openstack-cinder-volume.init
 Source13:         openstack-cinder-backup.init
+Source14:         cinder.conf.sample
+
 
 Source20:         cinder-sudoers
 
@@ -64,57 +66,49 @@ Requires:         MySQL-python
 Requires:         qemu-img
 Requires:         sysfsutils
 
-Requires:         python-paramiko >= 1.13.0
-
-Requires:         python-paste
-
-Requires:         python-qpid
-Requires:         python-kombu
-Requires:         python-amqplib
-
-Requires:         python-eventlet >= 0.15.1
+Requires:         python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0
+Requires:         python-anyjson >= 0.3.3
+Requires:         python-argparse
+Requires:         python-babel >= 1.3
+Requires:         python-eventlet >= 0.15.2
 Requires:         python-greenlet >= 0.3.2
 Requires:         python-iso8601 >= 0.1.9
+Requires:         python-keystonemiddleware >= 1.0.0
+Requires:         python-kombu >= 2.5.0
 Requires:         python-lxml >= 2.3
 Requires:         python-netaddr >= 0.7.12
 Requires:         python-oslo-config >= 1:1.4.0
-Requires:         python-oslo-db >= 1.0.0
-Requires:         python-oslo-messaging >= 1.4.0
+Requires:         python-oslo.concurrency >= 0.3.0
+Requires:         python-oslo-db >= 1.1.0
+Requires:         python-oslo-messaging >= 1.4.0, python-oslo.messaging < 1.5.0, python-oslo.messaging > 1.5.0
 Requires:         python-oslo-rootwrap >= 1.3.0
+Requires:         python-oslo.serialization >= 1.0.0
+Requires:         python-oslo.utils >= 1.0.0
 Requires:         python-osprofiler >= 0.3.0
-Requires:         python-anyjson >= 0.3.3
-Requires:         python-argparse
-#Requires:         python-cheetah
-Requires:         python-stevedore >= 1.0.0
-Requires:         python-suds >= 0.4
-
-Requires:         python-sqlalchemy  >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99
-Requires:         python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2
-
+Requires:         python-paramiko >= 1.13.0
 Requires:         python-paste-deploy >= 1.5.0
 Requires:         python-crypto >= 2.6
-Requires:         python-barbicanclient >= 2.1.0
+Requires:         python-barbicanclient >= 2.1.0, python-barbicanclient < 3.0.0, python-barbicanclient > 3.0.0
 Requires:         python-glanceclient >= 1:0.14.0
+Requires:         python-novaclient >= 1:2.18.0
+Requires:         python-swiftclient >= 2.2.0
+Requires:         python-requests >= 2.2.0, python-requests < 2.4.0, python-requests > 2.4.0
 Requires:         python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0
+Requires:         python-taskflow >= 0.4
+Requires:         python-rtslib-fb >= 2.1.fb39
+Requires:         python-six >= 1.7.0
+Requires:         python-sqlalchemy  >= 0.9.7, python-sqlalchemy <= 0.9.99
+Requires:         python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2
+Requires:         python-stevedore >= 1.1.0
+Requires:         python-suds >= 0.4
 Requires:         python-webob >= 1.2.3
 Requires:         python-wsgiref >= 0.1.2
-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
-Requires:         python-keystonemiddleware >= 1.0.0
-Requires:         python-kombu >= 2.4.8
-Requires:         python-novaclient >= 1:2.18.0
+Requires:         python-oslo.i18n >= 1.0.0
 
-Requires:         python-six >= 1.7.0
-
-Requires:         python-babel >= 1.3
+Requires:         python-qpid
+Requires:         python-amqplib
+Requires:         python-keystoneclient >= 1:0.10.0
 Requires:         python-lockfile
-
-Requires:         python-rtslib-fb >= 2.1.fb39
-Requires:         python-taskflow >= 0.4
-
 Requires:         python-ceph
 #Requires:         iscsi-initiator-utils
 
@@ -202,7 +196,7 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/cinder
 # Install config files
 install -d -m 755 %{buildroot}%{_sysconfdir}/cinder
 install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/cinder/cinder-dist.conf
-install -p -D -m 640 etc/cinder/cinder.conf.sample %{buildroot}%{_sysconfdir}/cinder/cinder.conf
+install -p -D -m 640 %{SOURCE14}  %{buildroot}%{_sysconfdir}/cinder/cinder.conf
 install -d -m 755 %{buildroot}%{_sysconfdir}/cinder/volumes
 install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt/conf.d/cinder.conf
 install -p -D -m 640 etc/cinder/rootwrap.conf %{buildroot}%{_sysconfdir}/cinder/rootwrap.conf
@@ -455,4 +449,4 @@ fi
 - Require python-cinderclient
 
 * Mon Sep  3 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.2.f3
-- Initial release
\ No newline at end of file
+- Initial release