X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-cinder.spec;h=e39dd511f66fd67f60a5ebb8b48f97e8f78eb194;hb=d009ec770802fa791ebbf74a8af2b492a9c7af8c;hp=a30eadddd92c7082635c19ffdb10d74ae67047ac;hpb=35937cc98ebfcf6d86582743d734cfe56d90163e;p=openstack-build%2Fcinder-build.git diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index a30eadddd..e39dd511f 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -1,15 +1,15 @@ %global with_doc %{!?_without_doc:1}%{?_without_doc:0} Name: openstack-cinder -Version: 2013.1 -Release: 0.4.g3%{?dist} +Version: 2013.2 +Release: 0.9.b3%{?dist} Summary: OpenStack Volume service Group: Applications/System License: ASL 2.0 URL: http://www.openstack.org/software/openstack-storage/ -Source0: cinder-%{version} -Source1: cinder.conf +Source0: https://launchpad.net/cinder/havana/havana-3/+download/cinder-%{version}.b3.tar.gz +Source1: cinder-dist.conf Source2: cinder.logrotate Source3: cinder-tgt.conf @@ -19,28 +19,32 @@ Source11: openstack-cinder-scheduler.init Source110: openstack-cinder-scheduler.upstart Source12: openstack-cinder-volume.init Source120: openstack-cinder-volume.upstart +Source13: openstack-cinder-backup.init +Source130: openstack-cinder-backup.upstart Source20: cinder-sudoers # -# patches_base=grizzly-3 +# patches_base=2013.2.b3 # Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch - -# This is EPEL specific and not upstream -Patch100: openstack-cinder-newdeps.patch +Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch +Patch0003: 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch +Patch0004: 0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch +Patch0005: MIRA-Do-not-clone-non-raw-images-in-rbd-backend.patch BuildArch: noarch BuildRequires: intltool +BuildRequires: python-d2to1 +BuildRequires: python-pbr BuildRequires: python-sphinx10 BuildRequires: python-setuptools BuildRequires: python-netaddr BuildRequires: openstack-utils -# These are required to build due to the requirements check added BuildRequires: python-paste-deploy1.5 BuildRequires: python-routes1.12 BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob1.0 +BuildRequires: python-webob1.2 Requires: openstack-utils Requires: python-cinder = %{version}-%{release} @@ -69,11 +73,15 @@ Requires: sudo Requires: MySQL-python +Requires: qemu-img +Requires: sysfsutils + Requires: python-paramiko Requires: python-qpid Requires: python-kombu Requires: python-amqplib +Requires: python-importlib Requires: python-eventlet Requires: python-greenlet @@ -83,15 +91,25 @@ Requires: python-lxml Requires: python-anyjson Requires: python-cheetah Requires: python-stevedore +Requires: python-suds Requires: python-sqlalchemy0.7 Requires: python-migrate Requires: python-paste-deploy1.5 Requires: python-routes1.12 -Requires: python-webob1.0 +Requires: python-webob1.2 Requires: python-glanceclient >= 1:0 +Requires: python-swiftclient >= 1.2 +Requires: python-keystoneclient +Requires: python-novaclient >= 2.14 + +Requires: python-oslo-config >= 1:1.2.0 +Requires: python-six + +Requires: python-babel +Requires: python-lockfile %description -n python-cinder OpenStack Volume (codename Cinder) provides services to manage and @@ -112,7 +130,7 @@ BuildRequires: graphviz BuildRequires: python-eventlet BuildRequires: python-routes1.12 BuildRequires: python-sqlalchemy0.7 -BuildRequires: python-webob1.0 +BuildRequires: python-webob1.2 # while not strictly required, quiets the build down when building docs. BuildRequires: python-migrate, python-iso8601 @@ -127,9 +145,10 @@ This package contains documentation files for cinder. %setup -q -n cinder-%{version} %patch0001 -p1 - -# Apply EPEL patch -%patch100 -p1 +%patch0002 -p1 +%patch0003 -p1 +%patch0004 -p1 +%patch0005 -p1 find . \( -name .gitignore -o -name .placeholder \) -delete @@ -138,6 +157,14 @@ find cinder -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + # TODO: Have the following handle multi line entries sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py +# Remove the requirements file so that pbr hooks don't add it +# to distutils requires_dist config +rm -rf {test-,}requirements.txt tools/{pip,test}-requires + +# We add REDHATCINDERVERSION/RELEASE with the pbr removal patch +sed -i s/REDHATCINDERVERSION/%{version}/ cinder/version.py +sed -i s/REDHATCINDERRELEASE/%{release}/ cinder/version.py + %build # Move authtoken configuration out of paste.ini @@ -180,7 +207,8 @@ 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}%{_sysconfdir}/cinder/cinder.conf +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 -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 @@ -191,6 +219,7 @@ install -p -D -m 640 etc/cinder/policy.json %{buildroot}%{_sysconfdir}/cinder/po install -p -D -m 755 %{SOURCE10} %{buildroot}%{_initrddir}/openstack-cinder-api install -p -D -m 755 %{SOURCE11} %{buildroot}%{_initrddir}/openstack-cinder-scheduler install -p -D -m 755 %{SOURCE12} %{buildroot}%{_initrddir}/openstack-cinder-volume +install -p -D -m 755 %{SOURCE13} %{buildroot}%{_initrddir}/openstack-cinder-backup # Install sudoers install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/cinder @@ -206,6 +235,7 @@ install -d -m 755 %{buildroot}%{_datadir}/cinder install -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/cinder/ install -p -m 644 %{SOURCE110} %{buildroot}%{_datadir}/cinder/ install -p -m 644 %{SOURCE120} %{buildroot}%{_datadir}/cinder/ +install -p -m 644 %{SOURCE130} %{buildroot}%{_datadir}/cinder/ # Install rootwrap files in /usr/share/cinder/rootwrap mkdir -p %{buildroot}%{_datarootdir}/cinder/rootwrap/ @@ -259,8 +289,9 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-cinder %config(noreplace) %{_sysconfdir}/sudoers.d/cinder %config(noreplace) %{_sysconfdir}/tgt/conf.d/cinder.conf +%attr(-, root, cinder) %{_datadir}/cinder/cinder-dist.conf -%dir %attr(0755, cinder, root) %{_localstatedir}/log/cinder +%dir %attr(0750, cinder, root) %{_localstatedir}/log/cinder %dir %attr(0755, cinder, root) %{_localstatedir}/run/cinder %dir %attr(0755, cinder, root) %{_sysconfdir}/cinder/volumes @@ -284,7 +315,51 @@ fi %endif %changelog -* Tue Mar 05 2013 Pádraig Brady - 2013.1.0.4.g3 +* Wed Sep 18 2013 Eric Harney - 2013.2-0.9.b3 +- Add cinder-dist.conf +- Tighten permissions on /var/log/cinder + +* Mon Sep 9 2013 Eric Harney - 2013.2-0.8.b3 +- Update to Havana milestone 3 +- Add dependency on python-novaclient + +* Thu Aug 29 2013 Pádraig Brady - 2013.2-0.7.b2 +- Add dependency on sysfsutils to support the fiber channel driver + +* Mon Aug 26 2013 Eric Harney - 2013.2-0.5.b2 +- Add cinder-backup service init script + +* Mon Jul 22 2013 Pádraig Brady - 2013.2-0.4.b2 +- Add dependency on python-suds to support the netapp driver +- Add dependency on python-keystoneclient for auth token middleware +- Add dependency on qemu-img for volume creation from Glance images + +* Sun Jul 21 2013 Pádraig Brady - 2013.2-0.3.b2 +- Update to Havana milestone 2 + +* Thu Jun 13 2013 Eric Harney - 2013.2-0.2.b1 +- Update to Havana milestone 1 + +* Fri May 10 2013 Eric Harney - 2013.1.1-1 +- Update to Grizzly stable release 1 + +* Mon Apr 08 2013 Eric Harney - 2013.1-2 +- Backport fix for GlusterFS driver get_volume_stats +- Adjust to support sqlalchemy-0.8.0 + +* Thu Apr 04 2013 Eric Harney - 2013.1-1 +- Update to Grizzly final release + +* Wed Mar 27 2013 Eric Harney - 2013.1-0.5.rc3 +- Update to Grizzly RC3 release + +* Mon Mar 25 2013 Eric Harney - 2013.1-0.5.rc2 +- Update to Grizzly RC2 release + +* Mon Mar 18 2013 Eric Harney - 2013.1-0.5.rc1 +- Update to Grizzly RC1 release + +* Tue Mar 05 2013 Pádraig Brady - 2013.1-0.4.g3 - Add dependency on python-stevedore * Wed Feb 27 2013 Eric Harney - 2013.1-0.2.g3