diff --git a/openstack-cinder.spec b/openstack-cinder.spec index 19f2ede1bdd57fb684f42ee82a61fabd85bd6aa7..6cfc682b5d65a14360a729d3be58ce3472a275d8 100644 --- a/openstack-cinder.spec +++ b/openstack-cinder.spec @@ -1,13 +1,14 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc %{!?_without_doc:0}%{?_without_doc:1} %global service cinder + %global common_desc \ OpenStack Volume (codename Cinder) provides services to manage and \ access block storage volumes for use by Virtual Machine instances. Name: openstack-%{service} Version: 13.0.9 -Release: 3 +Release: 4 Summary: OpenStack Volume service License: ASL 2.0 URL: http://www.openstack.org/software/openstack-storage/ @@ -194,8 +195,6 @@ Requires: python2-oslo-serialization >= 2.25.0 Requires: python2-oslo-service >= 2.0.0 Requires: python2-oslo-utils >= 3.40.2 Requires: python2-oslo-versionedobjects >= 1.31.2 -# Requires: python2-zstd >= 1.4.5 -# Requires: python2-importlib_metadata Requires: python2-taskflow >= 3.8.0 Requires: python2-requests >= 2.18.0 Requires: python2-pyparsing >= 2.2.1 @@ -290,35 +289,21 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d install -d -m 755 %{buildroot}%{_sysconfdir}/%{service}/volumes install -d -m 755 %{buildroot}%{_localstatedir}/log/%{service} install -d -m 755 %{buildroot}%{_localstatedir}/run/%{service} -install -d -m 640 %{buildroot}%{_datarootdir}/%{service}/rootwrap/ +install -d -m 755 %{buildroot}%{_datarootdir}/%{service}/rootwrap/ install -d -m 755 %{buildroot}%{_datadir} -install -p -D -m 644 %{SOURCE10} %{buildroot}%{_unitdir}/openstack-%{service}-api.service -install -p -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/openstack-%{service}-scheduler.service -install -p -D -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/openstack-%{service}-volume.service -install -p -D -m 644 %{SOURCE13} %{buildroot}%{_unitdir}/openstack-%{service}-backup.service +install -p -D -m 640 %{SOURCE10} %{buildroot}%{_unitdir}/openstack-%{service}-api.service +install -p -D -m 640 %{SOURCE11} %{buildroot}%{_unitdir}/openstack-%{service}-scheduler.service +install -p -D -m 640 %{SOURCE12} %{buildroot}%{_unitdir}/openstack-%{service}-volume.service +install -p -D -m 640 %{SOURCE13} %{buildroot}%{_unitdir}/openstack-%{service}-backup.service install -p -D -m 440 %{SOURCE20} %{buildroot}%{_sysconfdir}/sudoers.d/%{service} install -p -D -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-%{service} install -p -D -m 640 %{SOURCE22} %{buildroot}%{_datadir}/%{service}/%{service}-dist.conf -install -p -D -m 644 %{SOURCE23} %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d/os-brick.filters +install -p -D -m 640 %{SOURCE23} %{buildroot}%{_sysconfdir}/%{service}/rootwrap.d/os-brick.filters install -p -D -m 640 etc/%{service}/rootwrap.conf %{buildroot}%{_sysconfdir}/%{service}/rootwrap.conf install -p -D -m 640 etc/%{service}/api-paste.ini %{buildroot}%{_sysconfdir}/%{service}/api-paste.ini install -p -D -m 640 etc/%{service}/%{service}.conf.sample %{buildroot}%{_sysconfdir}/%{service}/%{service}.conf install -p -D -m 640 etc/%{service}/resource_filters.json %{buildroot}%{_sysconfdir}/%{service}/resource_filters.json -echo "----------------------------------" -ls -l %{buildroot} -ls -l %{buildroot}/usr -ls -l %{buildroot}%{_datarootdir} -ls -l %{buildroot}%{_datarootdir}/%{service} -ls -l %{buildroot}%{_datarootdir}/%{service}/rootwrap -echo "----------------------------------" -# install -p -D -m 644 etc/%{service}/rootwrap.d/* %{buildroot}%{_datarootdir}/%{service}/rootwrap/ -echo "==================================" -ls -l %{buildroot} -ls -l %{buildroot}/usr -ls -l %{buildroot}%{_datarootdir} -ls -l %{buildroot}%{_datarootdir}/%{service} -ls -l %{buildroot}%{_datarootdir}/%{service}/rootwrap -echo "==================================" +install -p -D -m 640 etc/%{service}/rootwrap.d/* %{buildroot}%{_datarootdir}/%{service}/rootwrap/ rm -f %{buildroot}%{python2_sitelib}/%{service}/locale/*/LC_*/%{service}*po rm -f %{buildroot}%{python2_sitelib}/%{service}/locale/*pot mv %{buildroot}%{python2_sitelib}/%{service}/locale %{buildroot}%{_datadir}/locale @@ -335,29 +320,35 @@ install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/ OS_TEST_PATH=./%{service}/tests/unit ostestr --concurrency=2 %endif -%pre -getent group %{service} >/dev/null || groupadd -r %{service} --gid 165 -if ! getent passwd %{service} >/dev/null; then - useradd -u 165 -r -g %{service} -G %{service},nobody -d %{_sharedstatedir}/%{service} -s /sbin/nologin -c "OpenStack Cinder Daemons" %{service} -fi +%pre common +%openstack_pre_user_group_create %{service} %{service} /sbin/nologin exit 0 -%post +%post volume %systemd_post openstack-%{service}-volume +%post api %systemd_post openstack-%{service}-api +%post scheduler %systemd_post openstack-%{service}-scheduler +%post backup %systemd_post openstack-%{service}-backup -%preun +%preun volume %systemd_preun openstack-%{service}-volume +%preun api %systemd_preun openstack-%{service}-api +%preun scheduler %systemd_preun openstack-%{service}-scheduler +%preun backup %systemd_preun openstack-%{service}-backup -%postun +%postun volume %systemd_postun_with_restart openstack-%{service}-volume +%postun api %systemd_postun_with_restart openstack-%{service}-api +%postun scheduler %systemd_postun_with_restart openstack-%{service}-scheduler +%postun backup %systemd_postun_with_restart openstack-%{service}-backup %files @@ -392,23 +383,24 @@ exit 0 %files common %license LICENSE -%dir %{_sysconfdir}/%{service} -%dir %attr(0755, %{service}, root) %{_sysconfdir}/%{service}/volumes -%dir %attr(0750, %{service}, root) %{_localstatedir}/log/%{service} -%dir %attr(0755, %{service}, root) %{_localstatedir}/run/%{service} -%dir %attr(-, %{service}, %{service}) %{_sharedstatedir}/%{service} -%dir %attr(-, %{service}, %{service}) %{_sharedstatedir}/%{service}/tmp -%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/%{service}.conf -%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/api-paste.ini -%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/rootwrap.conf -%config(noreplace) %attr(-, root, %{service}) %{_sysconfdir}/%{service}/resource_filters.json -%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-%{service} -%config(noreplace) %{_sysconfdir}/sudoers.d/%{service} +%dir %attr(0750, %{service}, %{service}) %{_sysconfdir}/%{service} +%dir %attr(0750, %{service}, %{service}) %{_sysconfdir}/%{service}/rootwrap.d +%dir %attr(0750, %{service}, %{service}) %{_sysconfdir}/%{service}/volumes +%dir %attr(0750, %{service}, %{service}) %{_localstatedir}/log/%{service} +%dir %attr(0750, %{service}, %{service}) %{_localstatedir}/run/%{service} +%dir %attr(0750, %{service}, %{service}) %{_sharedstatedir}/%{service} +%dir %attr(0750, %{service}, %{service}) %{_sharedstatedir}/%{service}/tmp +%attr(0640, root, %{service}) %{_sysconfdir}/logrotate.d/openstack-%{service} +%attr(0440, root, root) %{_sysconfdir}/sudoers.d/%{service} +%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/%{service}.conf +%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/api-paste.ini +%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/rootwrap.conf +%config(noreplace) %attr(0640, %{service}, %{service}) %{_sysconfdir}/%{service}/resource_filters.json %{_sysconfdir}/%{service}/rootwrap.d/ %{_bindir}/%{service}-* %{_unitdir}/*.service %{_datarootdir}/%{service} -%attr(-, root, %{service}) %{_datadir}/%{service}/%{service}-dist.conf +%attr(-, %{service}, %{service}) %{_datadir}/%{service}/%{service}-dist.conf %exclude %{_bindir}/%{service}-api %exclude %{_bindir}/%{service}-scheduler %exclude %{_bindir}/%{service}-volume @@ -439,6 +431,8 @@ exit 0 %endif %changelog +* Tue Jun 15 2021 OpenStack_SIG +- Unify the permissions of some files * Fri Jun 11 2021 zhangy1317 - Fix Requires * Tue Jun 1 2021 OpenStack_SIG