From 85369ec46a66af4d3282c998550936f6f9d701984e6059439bff11472a749dc1 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 27 Oct 2017 17:57:19 +0000 Subject: [PATCH] Accepting request 537239 from filesystems:ceph:luminous bsc#1061461 OBS-URL: https://build.opensuse.org/request/show/537239 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=139 --- _servicedata | 2 +- ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2 | 3 --- ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 | 3 +++ ceph-test.changes | 8 ++++++++ ceph-test.spec | 6 +++++- ceph.changes | 8 ++++++++ ceph.spec | 9 ++++++++- 7 files changed, 33 insertions(+), 6 deletions(-) delete mode 100644 ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2 create mode 100644 ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 diff --git a/_servicedata b/_servicedata index 0e4aa45..14b12d4 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - aea79b8b7a65a8ca5cc1de84c7fe7d99eaa72ec0 \ No newline at end of file + 5e5e14956b82cb1ebfe89b1b60e6e9489f4913cc \ No newline at end of file diff --git a/ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2 b/ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2 deleted file mode 100644 index 0bce10f..0000000 --- a/ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f54147afaadf4a7890d12d592ca04b6670fb1a1a1ea428c157b3dc966f2c948b -size 127762776 diff --git a/ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 b/ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 new file mode 100644 index 0000000..0928fd1 --- /dev/null +++ b/ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:900047e662ceb1a2b2bdb614658cb6b277029a0286205fc3b406798e63afba1e +size 127815591 diff --git a/ceph-test.changes b/ceph-test.changes index b9d8306..0d4eb3a 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 27 17:31:47 UTC 2017 - ncutler@suse.com + +- Update to version 12.2.1+git.1509122160.5e5e14956b: + + spec file: add %{_sysctldir}/90-ceph-osd.conf to ceph-osd + * ceph.spec.in,debian/rules: change aio-max-nr to 1048576 + * sysctl.d: set kernel.pid_max=4194304 (bsc#1061461) + ------------------------------------------------------------------- Sun Oct 15 07:58:18 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index a098525..0fd6ba1 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -68,7 +68,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.2.1+git.1507910930.aea79b8b7a +Version: 12.2.1+git.1509122160.5e5e14956b Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -505,6 +505,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING +install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -680,6 +681,7 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-osd.8* rm -rf %{buildroot}%{_sysconfdir}/cron.hourly/subman rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service rm -rf %{buildroot}%{_unitdir}/ceph-osd.target +rm -rf %{buildroot}%{_sysctldir}/90-ceph-osd.conf rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd rm -rf %{buildroot}%{_libdir}/librados.so.* rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so* @@ -859,6 +861,8 @@ rm -rf %{buildroot} %endif %if 0%{?fedora} || 0%{?rhel} %endif +%if 0%{?sysctl_apply} +%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/ceph.changes b/ceph.changes index b9d8306..0d4eb3a 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 27 17:31:47 UTC 2017 - ncutler@suse.com + +- Update to version 12.2.1+git.1509122160.5e5e14956b: + + spec file: add %{_sysctldir}/90-ceph-osd.conf to ceph-osd + * ceph.spec.in,debian/rules: change aio-max-nr to 1048576 + * sysctl.d: set kernel.pid_max=4194304 (bsc#1061461) + ------------------------------------------------------------------- Sun Oct 15 07:58:18 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index c39f44a..8baed6d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -68,7 +68,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.2.1+git.1507910930.aea79b8b7a +Version: 12.2.1+git.1509122160.5e5e14956b Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -933,6 +933,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING +install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -1468,6 +1469,7 @@ fi %{_unitdir}/ceph-osd@.service %{_unitdir}/ceph-osd.target %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd +%config(noreplace) %{_sysctldir}/90-ceph-osd.conf %post osd %if 0%{?suse_version} @@ -1481,6 +1483,11 @@ fi if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : fi +%if 0%{?sysctl_apply} + %sysctl_apply 90-ceph-osd.conf +%else + /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || : +%endif %preun osd %if 0%{?suse_version}