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

Accepting request 755238 from filesystems:ceph:octopus

Browse Source 
bsc#1157443, bsc#1157527

OBS-URL: https://build.opensuse.org/request/show/755238
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=255
This commit is contained in:
Nathan Cutler 2019-12-09 13:01:57 +00:00 committed by Git OBS Bridge
parent 0b1e9cf60d
commit bb82a77345
7 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-15.0.0-7456-ge089cead79.tar.bz2
View File

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

3
ceph-15.0.0-7866-g639502405f.tar.bz2 Normal file
View File

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

14
ceph-test.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Dec 2 11:51:18 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 15.0.0-7866-g639502405f:
+ rebase on tip of upstream master, SHA1 95dd54889a9c113f77dd6c2c7e77166335a59794
-------------------------------------------------------------------
Sun Nov 24 20:12:13 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 15.0.0-7686-g54042e1a06:
+ rebase on tip of upstream master, SHA1 2c06beb5ec38c8b9f7bd84152da3f5708de8d0c0
* Revert "Merge pull request #16715 from adamemerson/wip-I-Object!" (bsc#1157443)
* spec: add explicit openssh dependency to ceph-mgr-ssh (bsc#1157527)
-------------------------------------------------------------------
Thu Nov 21 10:10:02 UTC 2019 - Nathan Cutler <ncutler@suse.com>

22
ceph-test.spec
View File

@ -36,6 +36,7 @@
%bcond_without cephfs_java
%endif
%bcond_without amqp_endpoint
%bcond_without kafka_endpoint
%bcond_without lttng
%bcond_without libradosstriper
%bcond_without ocf
@ -45,6 +46,7 @@
%bcond_with selinux
%bcond_with cephfs_java
%bcond_with amqp_endpoint
%bcond_with kafka_endpoint
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%global _fillupdir /var/adm/fillup-templates
@ -107,7 +109,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 15.0.0.7456+ge089cead79
Version: 15.0.0.7866+g639502405f
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -123,7 +125,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7456-ge089cead79.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7866-g639502405f.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@ -208,6 +210,9 @@ BuildRequires: yasm
%if 0%{with amqp_endpoint}
BuildRequires: librabbitmq-devel
%endif
%if 0%{with kafka_endpoint}
BuildRequires: librdkafka-devel
%endif
%if 0%{with make_check}
BuildRequires: jq
BuildRequires: libuuid-devel
@ -426,6 +431,10 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
@ -555,7 +564,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-15.0.0-7456-ge089cead79
%autosetup -p1 -n ceph-15.0.0-7866-g639502405f
%build
# LTO can be enabled as soon as the following GCC bug is fixed:
@ -674,6 +683,11 @@ ${CMAKE} .. \
-DWITH_RADOSGW_AMQP_ENDPOINT=ON \
%else
-DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
%endif
%if 0%{with kafka_endpoint}
-DWITH_RADOSGW_KAFKA_ENDPOINT=ON \
%else
-DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
%endif
-DBOOST_J=$CEPH_SMP_NCPUS \
-DWITH_GRAFANA=ON
@ -723,6 +737,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
# sudoers.d
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
install -m 0600 -D sudoers.d/cephdaemon %{buildroot}%{_sysconfdir}/sudoers.d/cephdaemon
%if 0%{?rhel} >= 8
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@ -797,6 +812,7 @@ rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
rm -rf %{buildroot}%{_sbindir}/ceph-daemon
rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephdaemon
rm -rf %{buildroot}%doc
rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf
rm -rf %{buildroot}%license

14
ceph.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Dec 2 11:51:18 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 15.0.0-7866-g639502405f:
+ rebase on tip of upstream master, SHA1 95dd54889a9c113f77dd6c2c7e77166335a59794
-------------------------------------------------------------------
Sun Nov 24 20:12:13 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 15.0.0-7686-g54042e1a06:
+ rebase on tip of upstream master, SHA1 2c06beb5ec38c8b9f7bd84152da3f5708de8d0c0
* Revert "Merge pull request #16715 from adamemerson/wip-I-Object!" (bsc#1157443)
* spec: add explicit openssh dependency to ceph-mgr-ssh (bsc#1157527)
-------------------------------------------------------------------
Thu Nov 21 10:10:02 UTC 2019 - Nathan Cutler <ncutler@suse.com>

46
ceph.spec
View File

@ -36,6 +36,7 @@
%bcond_without cephfs_java
%endif
%bcond_without amqp_endpoint
%bcond_without kafka_endpoint
%bcond_without lttng
%bcond_without libradosstriper
%bcond_without ocf
@ -45,6 +46,7 @@
%bcond_with selinux
%bcond_with cephfs_java
%bcond_with amqp_endpoint
%bcond_with kafka_endpoint
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%global _fillupdir /var/adm/fillup-templates
@ -107,7 +109,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 15.0.0.7456+ge089cead79
Version: 15.0.0.7866+g639502405f
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -123,7 +125,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7456-ge089cead79.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7866-g639502405f.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -200,6 +202,9 @@ BuildRequires: yasm
%if 0%{with amqp_endpoint}
BuildRequires: librabbitmq-devel
%endif
%if 0%{with kafka_endpoint}
BuildRequires: librdkafka-devel
%endif
%if 0%{with make_check}
BuildRequires: jq
BuildRequires: libuuid-devel
@ -604,6 +609,12 @@ Group: System/Filesystems
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
Requires: python%{_python_buildid}-remoto
Requires: ceph-daemon = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
Requires: openssh
%endif
%if 0%{?rhel} || 0%{?fedora}
Requires: openssh-clients
%endif
%description mgr-ssh
ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
direct SSH connections for management operations.
@ -1187,7 +1198,7 @@ This package provides Ceph’s default alerts for Prometheus.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-15.0.0-7456-ge089cead79
%autosetup -p1 -n ceph-15.0.0-7866-g639502405f
%build
# LTO can be enabled as soon as the following GCC bug is fixed:
@ -1306,6 +1317,11 @@ ${CMAKE} .. \
-DWITH_RADOSGW_AMQP_ENDPOINT=ON \
%else
-DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
%endif
%if 0%{with kafka_endpoint}
-DWITH_RADOSGW_KAFKA_ENDPOINT=ON \
%else
-DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
%endif
-DBOOST_J=$CEPH_SMP_NCPUS \
-DWITH_GRAFANA=ON
@ -1355,6 +1371,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
# sudoers.d
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
install -m 0600 -D sudoers.d/cephdaemon %{buildroot}%{_sysconfdir}/sudoers.d/cephdaemon
%if 0%{?rhel} >= 8
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@ -1506,8 +1523,31 @@ if [ $1 -ge 1 ] ; then
fi
fi
%pre daemon
# create user
if ! getent passwd | grep -q '^cephdaemon:'; then
useradd -r -s /bin/bash -c "Ceph-daemon user for mgr/ssh" -m cephdaemon
fi
# set up (initially empty) .ssh/authorized_keys file
if ! test -d /home/cephdaemon/.ssh; then
mkdir /home/cephdaemon/.ssh
chown --reference /home/cephdaemon /home/cephdaemon/.ssh
chmod 0700 /home/cephdaemon/.ssh
fi
if ! test -e /home/cephdaemon/.ssh/authorized_keys; then
touch /home/cephdaemon/.ssh/authorized_keys
chown --reference /home/cephdaemon /home/cephdaemon/.ssh/authorized_keys
chmod 0600 /home/cephdaemon/.ssh/authorized_keys
fi
exit 0
%postun daemon
userdel -r cephdaemon || true
exit 0
%files daemon
%{_sbindir}/ceph-daemon
%{_sysconfdir}/sudoers.d/cephdaemon
%files common
%dir %{_docdir}/ceph

1
checkin.sh
View File

@ -104,6 +104,7 @@ if [ -z "$TMPDIR" ] ; then
rm -rf *.bz2
fi
echo "Running make-dist inside clone"
export DASHBOARD_FRONTEND_LANGS="ALL"
./make-dist
popd