Accepting request 756808 from filesystems:ceph:octopus
- Update to 15.0.0-8441-g88a99a841e + spec: fix cephadm user/group creation OBS-URL: https://build.opensuse.org/request/show/756808 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=257
This commit is contained in:
Git OBS Bridge
parent
53dcc0185c
commit
0f3ee5256b
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:41471146e485222af6d5d334119fa06d9f61dbfa9022c790d0e5eee30c23cc15
|
|
||||||
size 142999614
|
|
||||||
3
ceph-15.0.0-8441-g88a99a841e.tar.bz2
Normal file
3
ceph-15.0.0-8441-g88a99a841e.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:54fbd26c90cb35e6b97308cf6e986f22a5cd939380e6888d9fe48e1065baf321
|
||||||
|
size 142438252
|
||||||
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 13 12:33:34 UTC 2019 - Nathan Cutler <ncutler@suse.com>
|
||||||
|
|
||||||
|
- Update to 15.0.0-8441-g88a99a841e
|
||||||
|
+ spec: fix cephadm user/group creation
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 12 12:07:37 UTC 2019 - Nathan Cutler <ncutler@suse.com>
|
||||||
|
|
||||||
|
- Update to 15.0.0-8370-gec9b27b5e0
|
||||||
|
+ ceph-daemon is renamed to cephadm
|
||||||
|
+ mgr/ssh is renamed to mgr/cephadm
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 10 15:39:59 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
Tue Dec 10 15:39:59 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
|||||||
@ -109,7 +109,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph-test
|
Name: ceph-test
|
||||||
Version: 15.0.0.7866+g639502405f
|
Version: 15.0.0.8441+g88a99a841e
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -125,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
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
URL: http://ceph.com/
|
||||||
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7866-g639502405f.tar.bz2
|
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-8441-g88a99a841e.tar.bz2
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Source96: checkin.sh
|
Source96: checkin.sh
|
||||||
Source97: README-checkin.txt
|
Source97: README-checkin.txt
|
||||||
@ -221,16 +221,6 @@ BuildRequires: python%{_python_buildid}-nose
|
|||||||
BuildRequires: python%{_python_buildid}-requests
|
BuildRequires: python%{_python_buildid}-requests
|
||||||
BuildRequires: python%{_python_buildid}-six
|
BuildRequires: python%{_python_buildid}-six
|
||||||
BuildRequires: python%{_python_buildid}-virtualenv
|
BuildRequires: python%{_python_buildid}-virtualenv
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
BuildRequires: python%{_python_buildid}-coverage
|
|
||||||
BuildRequires: python%{_python_buildid}-pecan
|
|
||||||
BuildRequires: python%{_python_buildid}-tox
|
|
||||||
%endif
|
|
||||||
%if 0%{?rhel} == 7
|
|
||||||
BuildRequires: pyOpenSSL%{_python_buildid}
|
|
||||||
%else
|
|
||||||
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
|
||||||
%endif
|
|
||||||
BuildRequires: socat
|
BuildRequires: socat
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with seastar}
|
%if 0%{with seastar}
|
||||||
@ -300,17 +290,27 @@ BuildRequires: lz4-devel >= 1.7
|
|||||||
%endif
|
%endif
|
||||||
# distro-conditional make check dependencies
|
# distro-conditional make check dependencies
|
||||||
%if 0%{with make_check}
|
%if 0%{with make_check}
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
%if 0%{?fedora} || 0%{?rhel} == 7
|
%if 0%{?fedora} || 0%{?rhel} == 7
|
||||||
BuildRequires: libtool-ltdl-devel
|
BuildRequires: libtool-ltdl-devel
|
||||||
BuildRequires: python%{_python_buildid}-cherrypy
|
BuildRequires: python%{_python_buildid}-cherrypy
|
||||||
|
BuildRequires: python%{_python_buildid}-coverage
|
||||||
BuildRequires: python%{_python_buildid}-jwt
|
BuildRequires: python%{_python_buildid}-jwt
|
||||||
BuildRequires: python%{_python_buildid}-routes
|
BuildRequires: python%{_python_buildid}-routes
|
||||||
|
BuildRequires: python%{_python_buildid}-pecan
|
||||||
|
BuildRequires: python%{_python_buildid}-tox
|
||||||
BuildRequires: python%{_python_buildid}-werkzeug
|
BuildRequires: python%{_python_buildid}-werkzeug
|
||||||
BuildRequires: xmlsec1
|
BuildRequires: xmlsec1
|
||||||
BuildRequires: xmlsec1-devel
|
BuildRequires: xmlsec1-devel
|
||||||
BuildRequires: xmlsec1-nss
|
BuildRequires: xmlsec1-nss
|
||||||
BuildRequires: xmlsec1-openssl
|
BuildRequires: xmlsec1-openssl
|
||||||
BuildRequires: xmlsec1-openssl-devel
|
BuildRequires: xmlsec1-openssl-devel
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
BuildRequires: pyOpenSSL%{_python_buildid}
|
||||||
|
%else
|
||||||
|
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: libxmlsec1-1
|
BuildRequires: libxmlsec1-1
|
||||||
@ -320,7 +320,12 @@ BuildRequires: python%{_python_buildid}-CherryPy
|
|||||||
BuildRequires: python%{_python_buildid}-PyJWT
|
BuildRequires: python%{_python_buildid}-PyJWT
|
||||||
BuildRequires: python%{_python_buildid}-Routes
|
BuildRequires: python%{_python_buildid}-Routes
|
||||||
BuildRequires: python%{_python_buildid}-Werkzeug
|
BuildRequires: python%{_python_buildid}-Werkzeug
|
||||||
|
BuildRequires: python%{_python_buildid}-coverage
|
||||||
BuildRequires: python%{_python_buildid}-numpy-devel
|
BuildRequires: python%{_python_buildid}-numpy-devel
|
||||||
|
BuildRequires: python%{_python_buildid}-pecan
|
||||||
|
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
||||||
|
BuildRequires: python%{_python_buildid}-tox
|
||||||
|
BuildRequires: rpm-build
|
||||||
BuildRequires: xmlsec1-devel
|
BuildRequires: xmlsec1-devel
|
||||||
BuildRequires: xmlsec1-openssl-devel
|
BuildRequires: xmlsec1-openssl-devel
|
||||||
%endif
|
%endif
|
||||||
@ -564,7 +569,7 @@ This package contains Ceph benchmarks and test tools.
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-15.0.0-7866-g639502405f
|
%autosetup -p1 -n ceph-15.0.0-8441-g88a99a841e
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||||
@ -724,7 +729,13 @@ 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 etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
||||||
|
|
||||||
install -m 0755 src/ceph-daemon/ceph-daemon %{buildroot}%{_sbindir}/ceph-daemon
|
install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm
|
||||||
|
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
|
||||||
|
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
|
||||||
|
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
||||||
|
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
||||||
|
touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
|
chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
|
|
||||||
# firewall templates and /sbin/mount.ceph symlink
|
# firewall templates and /sbin/mount.ceph symlink
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -737,7 +748,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
|
|||||||
|
|
||||||
# sudoers.d
|
# sudoers.d
|
||||||
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
|
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
|
install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm
|
||||||
|
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
||||||
@ -811,8 +822,9 @@ rm -rf %{buildroot}%{_mandir}/man8/crushtool.8*
|
|||||||
rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
|
rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8*
|
rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8*
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
|
rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
|
||||||
rm -rf %{buildroot}%{_sbindir}/ceph-daemon
|
rm -rf %{buildroot}%{_sbindir}/cephadm
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephdaemon
|
rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephadm
|
||||||
|
rm -rf %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
rm -rf %{buildroot}%doc
|
rm -rf %{buildroot}%doc
|
||||||
rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf
|
rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf
|
||||||
rm -rf %{buildroot}%license
|
rm -rf %{buildroot}%license
|
||||||
@ -897,7 +909,7 @@ rm -rf %{buildroot}%{_datadir}/ceph/mgr/diskprediction_local
|
|||||||
rm -rf %{buildroot}%{_datadir}/ceph/mgr/diskprediction_cloud
|
rm -rf %{buildroot}%{_datadir}/ceph/mgr/diskprediction_cloud
|
||||||
rm -rf %{buildroot}%{_datadir}/ceph/mgr/rook
|
rm -rf %{buildroot}%{_datadir}/ceph/mgr/rook
|
||||||
rm -rf %{buildroot}%{_datadir}/ceph/mgr/k8sevents
|
rm -rf %{buildroot}%{_datadir}/ceph/mgr/k8sevents
|
||||||
rm -rf %{buildroot}%{_datadir}/ceph/mgr/ssh
|
rm -rf %{buildroot}%{_datadir}/ceph/mgr/cephadm
|
||||||
rm -rf %{buildroot}%{_bindir}/ceph-mon
|
rm -rf %{buildroot}%{_bindir}/ceph-mon
|
||||||
rm -rf %{buildroot}%{_bindir}/ceph-monstore-tool
|
rm -rf %{buildroot}%{_bindir}/ceph-monstore-tool
|
||||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8*
|
rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8*
|
||||||
@ -1072,6 +1084,8 @@ rm -rf %{buildroot}
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
%endif
|
%endif
|
||||||
|
%if ! 0%{?suse_version}
|
||||||
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%if %{with lttng}
|
%if %{with lttng}
|
||||||
|
|||||||
13
ceph.changes
13
ceph.changes
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 13 12:33:34 UTC 2019 - Nathan Cutler <ncutler@suse.com>
|
||||||
|
|
||||||
|
- Update to 15.0.0-8441-g88a99a841e
|
||||||
|
+ spec: fix cephadm user/group creation
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 12 12:07:37 UTC 2019 - Nathan Cutler <ncutler@suse.com>
|
||||||
|
|
||||||
|
- Update to 15.0.0-8370-gec9b27b5e0
|
||||||
|
+ ceph-daemon is renamed to cephadm
|
||||||
|
+ mgr/ssh is renamed to mgr/cephadm
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 10 15:39:59 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
Tue Dec 10 15:39:59 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
|||||||
109
ceph.spec
109
ceph.spec
@ -109,7 +109,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 15.0.0.7866+g639502405f
|
Version: 15.0.0.8441+g88a99a841e
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
@ -125,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
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
URL: http://ceph.com/
|
||||||
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-7866-g639502405f.tar.bz2
|
Source0: %{?_remote_tarball_prefix}ceph-15.0.0-8441-g88a99a841e.tar.bz2
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# _insert_obs_source_lines_here
|
# _insert_obs_source_lines_here
|
||||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
||||||
@ -213,16 +213,6 @@ BuildRequires: python%{_python_buildid}-nose
|
|||||||
BuildRequires: python%{_python_buildid}-requests
|
BuildRequires: python%{_python_buildid}-requests
|
||||||
BuildRequires: python%{_python_buildid}-six
|
BuildRequires: python%{_python_buildid}-six
|
||||||
BuildRequires: python%{_python_buildid}-virtualenv
|
BuildRequires: python%{_python_buildid}-virtualenv
|
||||||
%if 0%{?rhel} < 8
|
|
||||||
BuildRequires: python%{_python_buildid}-coverage
|
|
||||||
BuildRequires: python%{_python_buildid}-pecan
|
|
||||||
BuildRequires: python%{_python_buildid}-tox
|
|
||||||
%endif
|
|
||||||
%if 0%{?rhel} == 7
|
|
||||||
BuildRequires: pyOpenSSL%{_python_buildid}
|
|
||||||
%else
|
|
||||||
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
|
||||||
%endif
|
|
||||||
BuildRequires: socat
|
BuildRequires: socat
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with seastar}
|
%if 0%{with seastar}
|
||||||
@ -292,17 +282,27 @@ BuildRequires: lz4-devel >= 1.7
|
|||||||
%endif
|
%endif
|
||||||
# distro-conditional make check dependencies
|
# distro-conditional make check dependencies
|
||||||
%if 0%{with make_check}
|
%if 0%{with make_check}
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
%if 0%{?fedora} || 0%{?rhel} == 7
|
%if 0%{?fedora} || 0%{?rhel} == 7
|
||||||
BuildRequires: libtool-ltdl-devel
|
BuildRequires: libtool-ltdl-devel
|
||||||
BuildRequires: python%{_python_buildid}-cherrypy
|
BuildRequires: python%{_python_buildid}-cherrypy
|
||||||
|
BuildRequires: python%{_python_buildid}-coverage
|
||||||
BuildRequires: python%{_python_buildid}-jwt
|
BuildRequires: python%{_python_buildid}-jwt
|
||||||
BuildRequires: python%{_python_buildid}-routes
|
BuildRequires: python%{_python_buildid}-routes
|
||||||
|
BuildRequires: python%{_python_buildid}-pecan
|
||||||
|
BuildRequires: python%{_python_buildid}-tox
|
||||||
BuildRequires: python%{_python_buildid}-werkzeug
|
BuildRequires: python%{_python_buildid}-werkzeug
|
||||||
BuildRequires: xmlsec1
|
BuildRequires: xmlsec1
|
||||||
BuildRequires: xmlsec1-devel
|
BuildRequires: xmlsec1-devel
|
||||||
BuildRequires: xmlsec1-nss
|
BuildRequires: xmlsec1-nss
|
||||||
BuildRequires: xmlsec1-openssl
|
BuildRequires: xmlsec1-openssl
|
||||||
BuildRequires: xmlsec1-openssl-devel
|
BuildRequires: xmlsec1-openssl-devel
|
||||||
|
%if 0%{?rhel} == 7
|
||||||
|
BuildRequires: pyOpenSSL%{_python_buildid}
|
||||||
|
%else
|
||||||
|
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: libxmlsec1-1
|
BuildRequires: libxmlsec1-1
|
||||||
@ -312,7 +312,12 @@ BuildRequires: python%{_python_buildid}-CherryPy
|
|||||||
BuildRequires: python%{_python_buildid}-PyJWT
|
BuildRequires: python%{_python_buildid}-PyJWT
|
||||||
BuildRequires: python%{_python_buildid}-Routes
|
BuildRequires: python%{_python_buildid}-Routes
|
||||||
BuildRequires: python%{_python_buildid}-Werkzeug
|
BuildRequires: python%{_python_buildid}-Werkzeug
|
||||||
|
BuildRequires: python%{_python_buildid}-coverage
|
||||||
BuildRequires: python%{_python_buildid}-numpy-devel
|
BuildRequires: python%{_python_buildid}-numpy-devel
|
||||||
|
BuildRequires: python%{_python_buildid}-pecan
|
||||||
|
BuildRequires: python%{_python_buildid}-pyOpenSSL
|
||||||
|
BuildRequires: python%{_python_buildid}-tox
|
||||||
|
BuildRequires: rpm-build
|
||||||
BuildRequires: xmlsec1-devel
|
BuildRequires: xmlsec1-devel
|
||||||
BuildRequires: xmlsec1-openssl-devel
|
BuildRequires: xmlsec1-openssl-devel
|
||||||
%endif
|
%endif
|
||||||
@ -400,11 +405,11 @@ Requires: gptfdisk
|
|||||||
%description base
|
%description base
|
||||||
Base is the package that includes all the files shared amongst ceph servers
|
Base is the package that includes all the files shared amongst ceph servers
|
||||||
|
|
||||||
%package -n ceph-daemon
|
%package -n cephadm
|
||||||
Summary: Ceph-daemon utility to bootstrap Ceph clusters
|
Summary: cephadm utility to bootstrap Ceph clusters
|
||||||
Requires: podman
|
Requires: podman
|
||||||
%description -n ceph-daemon
|
%description -n cephadm
|
||||||
Ceph-daemon utility to bootstrap a Ceph cluster and manage ceph daemons
|
cephadm utility to bootstrap a Ceph cluster and manage ceph daemons
|
||||||
deployed with systemd and podman.
|
deployed with systemd and podman.
|
||||||
|
|
||||||
%package -n ceph-common
|
%package -n ceph-common
|
||||||
@ -490,7 +495,7 @@ Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release
|
|||||||
Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release}
|
Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release}
|
||||||
Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
|
Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
|
||||||
Recommends: ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release}
|
Recommends: ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release}
|
||||||
Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
|
Recommends: ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release}
|
||||||
Recommends: python%{_python_buildid}-influxdb
|
Recommends: python%{_python_buildid}-influxdb
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
@ -600,24 +605,24 @@ Requires: python%{_python_buildid}-PyYAML
|
|||||||
ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events
|
ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events
|
||||||
to kubernetes' events API
|
to kubernetes' events API
|
||||||
|
|
||||||
%package mgr-ssh
|
%package mgr-cephadm
|
||||||
Summary: Ceph Manager plugin for SSH-based orchestration
|
Summary: Ceph Manager plugin for cephadm-based orchestration
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
|
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
|
||||||
Requires: python%{_python_buildid}-remoto
|
Requires: python%{_python_buildid}-remoto
|
||||||
Requires: ceph-daemon = %{_epoch_prefix}%{version}-%{release}
|
Requires: cephadm = %{_epoch_prefix}%{version}-%{release}
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Requires: openssh
|
Requires: openssh
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?rhel} || 0%{?fedora}
|
%if 0%{?rhel} || 0%{?fedora}
|
||||||
Requires: openssh-clients
|
Requires: openssh-clients
|
||||||
%endif
|
%endif
|
||||||
%description mgr-ssh
|
%description mgr-cephadm
|
||||||
ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
|
ceph-mgr-cephadm is a ceph-mgr module for orchestration functions using
|
||||||
direct SSH connections for management operations.
|
the integrated cephadm deployment tool management operations.
|
||||||
|
|
||||||
%package fuse
|
%package fuse
|
||||||
Summary: Ceph fuse-based client
|
Summary: Ceph fuse-based client
|
||||||
@ -1044,7 +1049,7 @@ Group: Development/Libraries/Python
|
|||||||
%{?python_provide:%python_provide python-ceph-common}
|
%{?python_provide:%python_provide python-ceph-common}
|
||||||
%description -n python-ceph-common
|
%description -n python-ceph-common
|
||||||
This package contains data structures, classes and functions used by Ceph.
|
This package contains data structures, classes and functions used by Ceph.
|
||||||
It also contains utilities used for the SSH orchestrator.
|
It also contains utilities used for the cephadm orchestrator.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%package -n python%{python3_pkgversion}-ceph-common
|
%package -n python%{python3_pkgversion}-ceph-common
|
||||||
@ -1055,7 +1060,7 @@ Group: Development/Libraries/Python
|
|||||||
%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common}
|
%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common}
|
||||||
%description -n python%{python3_pkgversion}-ceph-common
|
%description -n python%{python3_pkgversion}-ceph-common
|
||||||
This package contains data structures, classes and functions used by Ceph.
|
This package contains data structures, classes and functions used by Ceph.
|
||||||
It also contains utilities used for the SSH orchestrator.
|
It also contains utilities used for the cephadm orchestrator.
|
||||||
|
|
||||||
%if 0%{with cephfs_shell}
|
%if 0%{with cephfs_shell}
|
||||||
%package -n cephfs-shell
|
%package -n cephfs-shell
|
||||||
@ -1198,7 +1203,7 @@ This package provides Ceph’s default alerts for Prometheus.
|
|||||||
# common
|
# common
|
||||||
#################################################################################
|
#################################################################################
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-15.0.0-7866-g639502405f
|
%autosetup -p1 -n ceph-15.0.0-8441-g88a99a841e
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||||
@ -1358,7 +1363,13 @@ 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 etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
||||||
|
|
||||||
install -m 0755 src/ceph-daemon/ceph-daemon %{buildroot}%{_sbindir}/ceph-daemon
|
install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm
|
||||||
|
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
|
||||||
|
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
|
||||||
|
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
||||||
|
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
||||||
|
touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
|
chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
|
|
||||||
# firewall templates and /sbin/mount.ceph symlink
|
# firewall templates and /sbin/mount.ceph symlink
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -1371,7 +1382,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
|
|||||||
|
|
||||||
# sudoers.d
|
# sudoers.d
|
||||||
install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
|
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
|
install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm
|
||||||
|
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
||||||
@ -1523,31 +1534,23 @@ if [ $1 -ge 1 ] ; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%pre daemon
|
%pre -n cephadm
|
||||||
# create user
|
getent group cephadm >/dev/null || groupadd cephadm
|
||||||
if ! getent passwd | grep -q '^cephdaemon:'; then
|
getent passwd cephadm >/dev/null || useradd -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm
|
||||||
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
|
exit 0
|
||||||
|
|
||||||
%postun daemon
|
%if ! 0%{?suse_version}
|
||||||
userdel -r cephdaemon || true
|
%postun -n cephadm
|
||||||
|
userdel -r cephadm || true
|
||||||
exit 0
|
exit 0
|
||||||
|
%endif
|
||||||
|
|
||||||
%files daemon
|
%files -n cephadm
|
||||||
%{_sbindir}/ceph-daemon
|
%{_sbindir}/cephadm
|
||||||
%{_sysconfdir}/sudoers.d/cephdaemon
|
%{_sysconfdir}/sudoers.d/cephadm
|
||||||
|
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm
|
||||||
|
%attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh
|
||||||
|
%attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||||
|
|
||||||
%files common
|
%files common
|
||||||
%dir %{_docdir}/ceph
|
%dir %{_docdir}/ceph
|
||||||
@ -1828,15 +1831,15 @@ if [ $1 -eq 1 ] ; then
|
|||||||
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%files mgr-ssh
|
%files mgr-cephadm
|
||||||
%{_datadir}/ceph/mgr/ssh
|
%{_datadir}/ceph/mgr/cephadm
|
||||||
|
|
||||||
%post mgr-ssh
|
%post mgr-cephadm
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%postun mgr-ssh
|
%postun mgr-cephadm
|
||||||
if [ $1 -eq 1 ] ; then
|
if [ $1 -eq 1 ] ; then
|
||||||
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user