RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-25 21:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26380 from tchaikov/wip-split-dashboard-package

Browse Source 
deb,rpm,qa: split dashboard package

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Kefu Chai 2019-02-14 16:59:58 +08:00 committed by GitHub
commit 9e561e9fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 133 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ceph.spec.in
View File

@ -431,20 +431,13 @@ Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-six
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
Requires: python%{_python_buildid}-jwt
Requires: python%{_python_buildid}-routes
Requires: python%{_python_buildid}-werkzeug
Requires: pyOpenSSL%{_python_buildid}
Requires: python%{_python_buildid}-bcrypt
%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
Requires: python%{_python_buildid}-pyOpenSSL
Requires: python%{_python_buildid}-bcrypt
Recommends: python%{_python_buildid}-influxdb
Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
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}
@ -455,6 +448,34 @@ 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
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
Requires: python%{_python_buildid}-jwt
Requires: python%{_python_buildid}-routes
Requires: python%{_python_buildid}-werkzeug
Requires: pyOpenSSL%{_python_buildid}
Requires: python%{_python_buildid}-bcrypt
%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
Requires: python%{_python_buildid}-pyOpenSSL
Requires: python%{_python_buildid}-bcrypt
%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
%if 0%{?suse_version}
@ -1441,7 +1462,6 @@ fi
%{_libdir}/ceph/mgr/ansible
%{_libdir}/ceph/mgr/balancer
%{_libdir}/ceph/mgr/crash
%{_libdir}/ceph/mgr/dashboard
%{_libdir}/ceph/mgr/deepsea
%{_libdir}/ceph/mgr/devicehealth
%{_libdir}/ceph/mgr/influx
@ -1511,6 +1531,19 @@ if [ $FIRST_ARG -ge 1 ] ; then
fi
fi
%files mgr-dashboard
%{_libdir}/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
%{_libdir}/ceph/mgr/diskprediction_local

1
debian/ceph-mgr-dashboard.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/ceph/mgr/dashboard

43
debian/ceph-mgr-dashboard.postinst vendored Normal file
View File

@ -0,0 +1,43 @@
#!/bin/sh
# vim: set noet ts=8:
# postinst script for ceph-mgr-dashboard
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
#
# postinst configure <most-recently-configured-version>
# old-postinst abort-upgrade <new-version>
# conflictor's-postinst abort-remove in-favour <package> <new-version>
# postinst abort-remove
# deconfigured's-postinst abort-deconfigure in-favour <failed-install-package> <version> [<removing conflicting-package> <version>]
#
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
# attempt to load the plugin if the mgr is running
deb-systemd-invoke try-restart ceph-mgr.target
;;
abort-upgrade|abort-remove|abort-deconfigure)
:
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0

8
debian/ceph-mgr-dashboard.prerm vendored Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
# vim: set noet ts=8:
set -e
#DEBHELPER#
exit 0

1
debian/ceph-mgr.install vendored
View File

@ -3,7 +3,6 @@ usr/bin/ceph-mgr
usr/lib/ceph/mgr/ansible
usr/lib/ceph/mgr/balancer
usr/lib/ceph/mgr/crash
usr/lib/ceph/mgr/dashboard
usr/lib/ceph/mgr/deepsea
usr/lib/ceph/mgr/devicehealth
usr/lib/ceph/mgr/influx

28
debian/control vendored
View File

@ -187,7 +187,10 @@ Depends: ceph-base (= ${binary:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends},
Recommends: ceph-mgr-diskprediction-local, ceph-mgr-diskprediction-cloud, ceph-mgr-rook
Recommends: ceph-mgr-dashboard,
ceph-mgr-diskprediction-local,
ceph-mgr-diskprediction-cloud,
ceph-mgr-rook
Suggests: python-influxdb
Replaces: ceph (<< 0.93-417),
Breaks: ceph (<< 0.93-417),
@ -199,6 +202,29 @@ Description: manager for the ceph distributed storage system
This package contains the manager daemon, which is used to expose high
level management and monitoring functionality.
Package: ceph-mgr-dashboard
Architecture: all
Depends: ceph-mgr (= ${binary:Version}),
python-cherrypy3,
python-jwt,
python-openssl,
python-bcrypt,
python-werkzeug,
${misc:Depends},
${python:Depends},
${shlibs:Depends},
Description: dashboard plugin for ceph-mgr
Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object,
block and file system storage.
.
This package provides a ceph-mgr 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: ceph-mgr-diskprediction-local
Architecture: all
Depends: ceph-mgr (= ${binary:Version}),

1
qa/packages/packages.yaml
View File

@ -37,6 +37,7 @@ ceph:
- ceph-test
- ceph
- ceph-mgr
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-cloud
- ceph-mgr-diskprediction-local
- ceph-mgr-rook

1
qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-luminous.yaml
View File

@ -6,6 +6,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-luminous.yaml
View File

@ -6,6 +6,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/fs/upgrade/snaps/tasks/0-luminous.yaml
View File

@ -6,6 +6,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
View File

@ -12,6 +12,7 @@ tasks:
downgrade_packages: ['librbd1', 'librados2']
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
View File

@ -3,6 +3,7 @@ tasks:
branch: jewel
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
View File

@ -3,6 +3,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
View File

@ -11,6 +11,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml
View File

@ -8,6 +8,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
View File

@ -5,6 +5,7 @@ tasks:
branch: luminous
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
View File

@ -8,6 +8,7 @@ tasks:
branch: mimic
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook

1
qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
View File

@ -5,6 +5,7 @@ tasks:
branch: mimic
exclude_packages:
- librados3
- ceph-mgr-dashboard
- ceph-mgr-diskprediction-local
- ceph-mgr-diskprediction-cloud
- ceph-mgr-rook