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

deb,rpm,qa: split dashboard package

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>

5 files changed, 79 insertions, 2 deletions

diff --git a/debian/ceph-mgr-dashboard.install b/debian/ceph-mgr-dashboard.install
new file mode 100644
index 00000000000..618dcbddaa8
--- /dev/null
+++ b/debian/ceph-mgr-dashboard.install
@@ -0,0 +1 @@
+usr/lib/ceph/mgr/dashboard
diff --git a/debian/ceph-mgr-dashboard.postinst b/debian/ceph-mgr-dashboard.postinst
new file mode 100644
index 00000000000..e681ef6b62f
--- /dev/null
+++ b/debian/ceph-mgr-dashboard.postinst
@@ -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
+
+
diff --git a/debian/ceph-mgr-dashboard.prerm b/debian/ceph-mgr-dashboard.prerm
new file mode 100644
index 00000000000..e8e9959b1f3
--- /dev/null
+++ b/debian/ceph-mgr-dashboard.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+# vim: set noet ts=8:
+
+set -e
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ceph-mgr.install b/debian/ceph-mgr.install
index dff4e69a3c1..21891ab25fb 100644
--- a/debian/ceph-mgr.install
+++ b/debian/ceph-mgr.install
@@ -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
diff --git a/debian/control b/debian/control
index 05861a89183..ddc3f8e55fa 100644
--- a/debian/control
+++ b/debian/control
@@ -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}),