From 0f3ee5256b33ee860cf01945990fcde789f401a50bfa6b670f35700d6d2c5dd3 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 13 Dec 2019 12:35:21 +0000 Subject: [PATCH] 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 --- ceph-15.0.0-7866-g639502405f.tar.bz2 | 3 - ceph-15.0.0-8441-g88a99a841e.tar.bz2 | 3 + ceph-test.changes | 13 ++++ ceph-test.spec | 50 +++++++----- ceph.changes | 13 ++++ ceph.spec | 109 ++++++++++++++------------- 6 files changed, 117 insertions(+), 74 deletions(-) delete mode 100644 ceph-15.0.0-7866-g639502405f.tar.bz2 create mode 100644 ceph-15.0.0-8441-g88a99a841e.tar.bz2 diff --git a/ceph-15.0.0-7866-g639502405f.tar.bz2 b/ceph-15.0.0-7866-g639502405f.tar.bz2 deleted file mode 100644 index 9ee6539..0000000 --- a/ceph-15.0.0-7866-g639502405f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41471146e485222af6d5d334119fa06d9f61dbfa9022c790d0e5eee30c23cc15 -size 142999614 diff --git a/ceph-15.0.0-8441-g88a99a841e.tar.bz2 b/ceph-15.0.0-8441-g88a99a841e.tar.bz2 new file mode 100644 index 0000000..b5b5043 --- /dev/null +++ b/ceph-15.0.0-8441-g88a99a841e.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54fbd26c90cb35e6b97308cf6e986f22a5cd939380e6888d9fe48e1065baf321 +size 142438252 diff --git a/ceph-test.changes b/ceph-test.changes index d93dd8e..1ddd0a5 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Dec 13 12:33:34 UTC 2019 - Nathan Cutler + +- Update to 15.0.0-8441-g88a99a841e + + spec: fix cephadm user/group creation + +------------------------------------------------------------------- +Thu Dec 12 12:07:37 UTC 2019 - Nathan Cutler + +- 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 diff --git a/ceph-test.spec b/ceph-test.spec index f726d78..b7bb1b5 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -109,7 +109,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 15.0.0.7866+g639502405f +Version: 15.0.0.8441+g88a99a841e Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} Source96: checkin.sh Source97: README-checkin.txt @@ -221,16 +221,6 @@ BuildRequires: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-requests BuildRequires: python%{_python_buildid}-six 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 %endif %if 0%{with seastar} @@ -300,17 +290,27 @@ BuildRequires: lz4-devel >= 1.7 %endif # distro-conditional make check dependencies %if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} == 7 BuildRequires: libtool-ltdl-devel BuildRequires: python%{_python_buildid}-cherrypy +BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-nss BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +%if 0%{?rhel} == 7 +BuildRequires: pyOpenSSL%{_python_buildid} +%else +BuildRequires: python%{_python_buildid}-pyOpenSSL +%endif +%endif %endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 @@ -320,7 +320,12 @@ BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-coverage 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-openssl-devel %endif @@ -564,7 +569,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-15.0.0-7866-g639502405f +%autosetup -p1 -n ceph-15.0.0-8441-g88a99a841e %build # 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 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 %if 0%{?suse_version} @@ -737,7 +748,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 +install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 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/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}%{_sbindir}/cephadm +rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/cephadm +rm -rf %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys rm -rf %{buildroot}%doc rm -rf %{buildroot}%{_docdir}/ceph/sample.ceph.conf 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/rook 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-monstore-tool rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8* @@ -1072,6 +1084,8 @@ rm -rf %{buildroot} %endif %if 0%{?fedora} || 0%{?rhel} %endif +%if ! 0%{?suse_version} +%endif %if 0%{?suse_version} %endif %if %{with lttng} diff --git a/ceph.changes b/ceph.changes index d93dd8e..1ddd0a5 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Dec 13 12:33:34 UTC 2019 - Nathan Cutler + +- Update to 15.0.0-8441-g88a99a841e + + spec: fix cephadm user/group creation + +------------------------------------------------------------------- +Thu Dec 12 12:07:37 UTC 2019 - Nathan Cutler + +- 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 diff --git a/ceph.spec b/ceph.spec index 1b886af..038ec15 100644 --- a/ceph.spec +++ b/ceph.spec @@ -109,7 +109,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.0.0.7866+g639502405f +Version: 15.0.0.8441+g88a99a841e Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -213,16 +213,6 @@ BuildRequires: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-requests BuildRequires: python%{_python_buildid}-six 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 %endif %if 0%{with seastar} @@ -292,17 +282,27 @@ BuildRequires: lz4-devel >= 1.7 %endif # distro-conditional make check dependencies %if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel} == 7 BuildRequires: libtool-ltdl-devel BuildRequires: python%{_python_buildid}-cherrypy +BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-tox BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-nss BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel +%if 0%{?rhel} == 7 +BuildRequires: pyOpenSSL%{_python_buildid} +%else +BuildRequires: python%{_python_buildid}-pyOpenSSL +%endif +%endif %endif %if 0%{?suse_version} BuildRequires: libxmlsec1-1 @@ -312,7 +312,12 @@ BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-coverage 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-openssl-devel %endif @@ -400,11 +405,11 @@ Requires: gptfdisk %description base Base is the package that includes all the files shared amongst ceph servers -%package -n ceph-daemon -Summary: Ceph-daemon utility to bootstrap Ceph clusters +%package -n cephadm +Summary: cephadm utility to bootstrap Ceph clusters Requires: podman -%description -n ceph-daemon -Ceph-daemon utility to bootstrap a Ceph cluster and manage ceph daemons +%description -n cephadm +cephadm utility to bootstrap a Ceph cluster and manage ceph daemons deployed with systemd and podman. %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-rook = %{_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 %endif %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 to kubernetes' events API -%package mgr-ssh -Summary: Ceph Manager plugin for SSH-based orchestration +%package mgr-cephadm +Summary: Ceph Manager plugin for cephadm-based orchestration BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-remoto -Requires: ceph-daemon = %{_epoch_prefix}%{version}-%{release} +Requires: cephadm = %{_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. +%description mgr-cephadm +ceph-mgr-cephadm is a ceph-mgr module for orchestration functions using +the integrated cephadm deployment tool management operations. %package fuse Summary: Ceph fuse-based client @@ -1044,7 +1049,7 @@ Group: Development/Libraries/Python %{?python_provide:%python_provide python-ceph-common} %description -n python-ceph-common 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 %package -n python%{python3_pkgversion}-ceph-common @@ -1055,7 +1060,7 @@ Group: Development/Libraries/Python %{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common} %description -n python%{python3_pkgversion}-ceph-common 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} %package -n cephfs-shell @@ -1198,7 +1203,7 @@ This package provides Ceph’s default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-15.0.0-7866-g639502405f +%autosetup -p1 -n ceph-15.0.0-8441-g88a99a841e %build # 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 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 %if 0%{?suse_version} @@ -1371,7 +1382,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 +install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -1523,31 +1534,23 @@ 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 +%pre -n cephadm +getent group cephadm >/dev/null || groupadd cephadm +getent passwd cephadm >/dev/null || useradd -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm exit 0 -%postun daemon -userdel -r cephdaemon || true +%if ! 0%{?suse_version} +%postun -n cephadm +userdel -r cephadm || true exit 0 +%endif -%files daemon -%{_sbindir}/ceph-daemon -%{_sysconfdir}/sudoers.d/cephdaemon +%files -n cephadm +%{_sbindir}/cephadm +%{_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 %dir %{_docdir}/ceph @@ -1828,15 +1831,15 @@ if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%files mgr-ssh -%{_datadir}/ceph/mgr/ssh +%files mgr-cephadm +%{_datadir}/ceph/mgr/cephadm -%post mgr-ssh +%post mgr-cephadm if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%postun mgr-ssh +%postun mgr-cephadm if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi