Source11: openstack-cinder-scheduler.init
Source12: openstack-cinder-volume.init
Source13: openstack-cinder-backup.init
+Source14: cinder.conf.sample
+
Source20: cinder-sudoers
# patches_base=2014.1.1
#
Patch0001: 0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
-Patch0002: 0002-Revert-Switch-over-to-oslosphinx.patch
BuildArch: noarch
BuildRequires: intltool
BuildRequires: python-pbr
BuildRequires: python-sphinx
BuildRequires: python-setuptools
-BuildRequires: python-netaddr
+BuildRequires: python-netaddr >= 0.7.12
Requires: openstack-utils
Requires: python-cinder = %{version}-%{release}
Requires: qemu-img
Requires: sysfsutils
-Requires: python-paramiko >= 1.13.0
-
-Requires: python-qpid
-Requires: python-kombu
-Requires: python-amqplib
-
-Requires: python-eventlet >= 0.13.0
+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-netaddr >= 0.7.6
+Requires: python-keystonemiddleware >= 1.0.0
+Requires: python-kombu >= 2.5.0
Requires: python-lxml >= 2.3
-Requires: python-anyjson >= 0.3.3
-#Requires: python-cheetah
-Requires: python-stevedore >= 0.14
-Requires: python-suds
-
-Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy < 0.95, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
-Requires: python-migrate >= 0.9.1
-
+Requires: python-netaddr >= 0.7.12
+Requires: python-oslo-config >= 1: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-paramiko >= 1.13.0
Requires: python-paste-deploy >= 1.5.0
+Requires: python-crypto >= 2.6
+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-webob >= 1.2.3
-
-Requires: python-glanceclient >= 1:0
-Requires: python-swiftclient >= 2.0.2
-Requires: python-keystoneclient
-Requires: python-keystonemiddleware >= 1.0.0
-Requires: python-novaclient >= 1:2.17
-
-Requires: python-oslo-config >= 1:1.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-babel >= 1.3
+Requires: python-qpid
+Requires: python-amqplib
+Requires: python-keystoneclient >= 1:0.10.0
Requires: python-lockfile
-
-Requires: python-oslo-rootwrap
-Requires: python-rtslib-fb
-Requires: python-taskflow
-Requires: python-oslo-messaging >= 1.3.0-0.1.a9
-
Requires: python-ceph
#Requires: iscsi-initiator-utils
%setup -q -n cinder-%{version}
%patch0001 -p1
-%patch0002 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
# 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
* Mon Sep 3 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.2.f3
- Initial release
-