Add SOURCE/cinder.conf.sample file

[openstack-build/cinder-build.git] / rpm / SPECS / openstack-cinder.spec

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 1fef74a92c52f8604b6d2f343ef8ff5ee4f72581..2b41a01a6d0b9d5fff65419cc9c3898ae1fff3ae 100644 (file)
--- 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
 
@@ -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
 
@@ -201,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
@@ -454,4 +456,4 @@ fi
 - Require python-cinderclient
 
 * Mon Sep  3 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.2.f3
-- Initial release
+- Initial release
\ No newline at end of file