From 49cb8428196f9750cec5a24d54b97f3010e1dafd Mon Sep 17 00:00:00 2001 From: markeryang Date: Thu, 18 Feb 2021 15:18:42 +0800 Subject: [PATCH] Temporary delete mgr-rook and k8sevents --- ceph.spec | 133 ++++-------------------------------------------------- 1 file changed, 9 insertions(+), 124 deletions(-) diff --git a/ceph.spec b/ceph.spec index 8582523..431500a 100644 --- a/ceph.spec +++ b/ceph.spec @@ -110,7 +110,7 @@ ################################################################################# Name: ceph Version: 14.2.15 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -488,40 +488,6 @@ module derived from Calamari) and expose CLI hooks. ceph-mgr gathers the cluster maps, the daemon metadata, and performance counters, and exposes all these to the python modules. -%package mgr-dashboard -Summary: Ceph Dashboard -BuildArch: noarch -%if 0%{?suse_version} -Group: System/Filesystems -%endif -Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -Requires: python%{_python_buildid}-cherrypy -Requires: python%{_python_buildid}-jwt -Requires: python%{_python_buildid}-routes -Requires: python%{_python_buildid}-werkzeug -%if 0%{?weak_deps} -Recommends: python%{_python_buildid}-saml -%endif -%endif -%if 0%{?suse_version} -Requires: python%{_python_buildid}-CherryPy -Requires: python%{_python_buildid}-PyJWT -Requires: python%{_python_buildid}-Routes -Requires: python%{_python_buildid}-Werkzeug -%endif -%if 0%{?rhel} == 7 -Requires: pyOpenSSL -%else -Requires: python%{_python_buildid}-pyOpenSSL -%endif -%description mgr-dashboard -ceph-mgr-dashboard is a manager plugin, providing a web-based application -to monitor and manage many aspects of a Ceph cluster and related components. -See the Dashboard documentation at http://docs.ceph.com/ for details and a -detailed feature overview. - %package mgr-diskprediction-local Summary: ceph-mgr diskprediction_local plugin BuildArch: noarch @@ -552,42 +518,6 @@ Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict disk failures using services in the Google cloud. -%package mgr-rook -BuildArch: noarch -Summary: ceph-mgr rook plugin -%if 0%{?suse_version} -Group: System/Filesystems -%endif -Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-kubernetes -%description mgr-rook -ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using -a Rook backend. - -%package mgr-k8sevents -BuildArch: noarch -Summary: Ceph Manager plugin to orchestrate ceph-events to kubernetes' events API -%if 0%{?suse_version} -Group: System/Filesystems -%endif -Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-kubernetes -%description mgr-k8sevents -ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events -to kubernetes' events API - -%package mgr-ssh -Summary: ceph-mgr ssh module -BuildArch: noarch -%if 0%{?suse_version} -Group: System/Filesystems -%endif -Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-remoto -%description mgr-ssh -ceph-mgr-ssh is a ceph-mgr module for orchestration functions using -direct SSH connections for management operations. - %package fuse Summary: Ceph fuse-based client %if 0%{?suse_version} @@ -1496,6 +1426,10 @@ fi %{_unitdir}/ceph-mgr@.service %{_unitdir}/ceph-mgr.target %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr +%exclude %{_datadir}/ceph/mgr/rook +%exclude %{_datadir}/ceph/mgr/k8sevents +%exclude %{_datadir}/ceph/mgr/dashboard +%exclude %{_datadir}/ceph/mgr/ssh %post mgr %if 0%{?suse_version} @@ -1538,19 +1472,6 @@ if [ $1 -ge 1 ] ; then fi fi -%files mgr-dashboard -%{_datadir}/ceph/mgr/dashboard - -%post mgr-dashboard -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%postun mgr-dashboard -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - %files mgr-diskprediction-local %{_datadir}/ceph/mgr/diskprediction_local @@ -1577,45 +1498,6 @@ if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%files mgr-rook -%{_datadir}/ceph/mgr/rook - -%post mgr-rook -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%postun mgr-rook -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%files mgr-k8sevents -%{_datadir}/ceph/mgr/k8sevents - -%post mgr-k8sevents -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%postun mgr-k8sevents -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 - -%post mgr-ssh -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - -%postun mgr-ssh -if [ $1 -eq 1 ] ; then - /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : -fi - %files mon %{_bindir}/ceph-mon %{_bindir}/ceph-monstore-tool @@ -2151,8 +2033,11 @@ exit 0 %changelog +* Thu Feb 18 2021 yanglongkang - 1:14.2.15-3 +- Temporary delete mgr-rook, mgr-ssh, mgr-dashboard and k8sevents + * Wed Feb 10 2021 yanglongkang - 1:14.2.15-2 -- fix build +- Removing python2 dependency to fix build * Fri Jan 22 2021 yanglongkang - 1:14.2.15-1 - update to 14.2.15 -- Gitee