]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #26380 from tchaikov/wip-split-dashboard-package
authorKefu Chai <tchaikov@gmail.com>
Thu, 14 Feb 2019 08:59:58 +0000 (16:59 +0800)
committerGitHub <noreply@github.com>
Thu, 14 Feb 2019 08:59:58 +0000 (16:59 +0800)
deb,rpm,qa: split dashboard package

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
ceph.spec.in
debian/ceph-mgr.install
qa/suites/rados/upgrade/luminous-x-singleton/1-install/luminous.yaml
qa/suites/upgrade/luminous-x/parallel/1-ceph-install/luminous.yaml

diff --cc ceph.spec.in
index b2bb3f181961cd1cb509c1bd14bed08b0619e6c5,36e13c5ec173b894ec31ec17ffe888f5cacc07a3..ff9ac7de03c6cbc143d71903e905b18dadc77df7
@@@ -455,8 -448,37 +448,36 @@@ module derived from Calamari) and expos
  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
 -BuildArch:    noarch
  %if 0%{?suse_version}
  Group:          System/Filesystems
  %endif
Simple merge