X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-cinder.spec;h=2b41a01a6d0b9d5fff65419cc9c3898ae1fff3ae;hb=414db721177093f024052db5831a6702c0d94e92;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..2b41a01a6 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
 
@@ -69,7 +71,7 @@ Requires:         python-paramiko >= 1.13.0
 Requires:         python-paste
 
 Requires:         python-qpid
-Requires:         python-kombu
+Requires:         python-kombu >= 2.5.0
 Requires:         python-amqplib
 
 Requires:         python-eventlet >= 0.15.1
@@ -81,10 +83,10 @@ 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-rootwrap >= 1.3.0
+Requires:         python-oslo.concurrency >= 0.3.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
 
@@ -102,9 +104,8 @@ 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-keystoneclient >= 1:0.10.0
 Requires:         python-keystonemiddleware >= 1.0.0
-Requires:         python-kombu >= 2.4.8
 Requires:         python-novaclient >= 1:2.18.0
 
 Requires:         python-six >= 1.7.0
@@ -202,7 +203,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