Accepting request 538841 from filesystems:ceph

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/538841
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=23

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/SUSE/ceph.git</param>
-          <param name="changesrevision">aea79b8b7a65a8ca5cc1de84c7fe7d99eaa72ec0</param></service></servicedata>
+          <param name="changesrevision">9347aa6662313f7891a148553250cf7440d14d38</param></service></servicedata>

ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f54147afaadf4a7890d12d592ca04b6670fb1a1a1ea428c157b3dc966f2c948b
-size 127762776

ceph-12.2.1+git.1509128342.9347aa6662.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbfee2f12e5980971ae301a44fdc4e44c450eb98bff90329bebd198663d1956b
+size 127807334

ceph-test.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct 27 19:15:21 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.2.1+git.1509128342.9347aa6662:
+  + common/common_init: disable ms subsystem log gathering for clients
+  + 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
 

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.1509128342.9347aa6662
 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}

ceph.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct 27 19:15:21 UTC 2017 - ncutler@suse.com
+
+- Update to version 12.2.1+git.1509128342.9347aa6662:
+  + common/common_init: disable ms subsystem log gathering for clients
+  + 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
 

ceph.spec

@@ -68,7 +68,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.2.1+git.1507910930.aea79b8b7a
+Version:	12.2.1+git.1509128342.9347aa6662
 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}