rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 537239 from filesystems:ceph:luminous

Browse Source 
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
This commit is contained in:
Nathan Cutler 2017-10-27 17:57:19 +00:00 committed by Git OBS Bridge
parent 303299c87b
commit 85369ec46a
7 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_servicedata
View File

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

3
ceph-12.2.1+git.1507910930.aea79b8b7a.tar.bz2
View File

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

3
ceph-12.2.1+git.1509122160.5e5e14956b.tar.bz2 Normal file
View File

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

8
ceph-test.changes
View File

@ -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 Sun Oct 15 07:58:18 UTC 2017 - ncutler@suse.com

6
ceph-test.spec
View File

@ -68,7 +68,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 12.2.1+git.1507910930.aea79b8b7a Version: 12.2.1+git.1509122160.5e5e14956b
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -505,6 +505,7 @@ mkdir -p %{buildroot}%{_sbindir}
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING 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 # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} %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}%{_sysconfdir}/cron.hourly/subman
rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service
rm -rf %{buildroot}%{_unitdir}/ceph-osd.target 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}%{_prefix}/lib/ocf/resource.d/ceph/rbd
rm -rf %{buildroot}%{_libdir}/librados.so.* rm -rf %{buildroot}%{_libdir}/librados.so.*
rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so* rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so*
@ -859,6 +861,8 @@ rm -rf %{buildroot}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%endif %endif
%if 0%{?sysctl_apply}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}

8
ceph.changes
View File

@ -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 Sun Oct 15 07:58:18 UTC 2017 - ncutler@suse.com

9
ceph.spec
View File

@ -68,7 +68,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 12.2.1+git.1507910930.aea79b8b7a Version: 12.2.1+git.1509122160.5e5e14956b
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -933,6 +933,7 @@ mkdir -p %{buildroot}%{_sbindir}
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING 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 # firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version} %if 0%{?suse_version}
@ -1468,6 +1469,7 @@ fi
%{_unitdir}/ceph-osd@.service %{_unitdir}/ceph-osd@.service
%{_unitdir}/ceph-osd.target %{_unitdir}/ceph-osd.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
%config(noreplace) %{_sysctldir}/90-ceph-osd.conf
%post osd %post osd
%if 0%{?suse_version} %if 0%{?suse_version}
@ -1481,6 +1483,11 @@ fi
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
/usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || :
fi 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 %preun osd
%if 0%{?suse_version} %if 0%{?suse_version}