debian: fix ceph-mgr-modules-core files

Remove the files from ceph-mgr that are added to ceph-mgr-modules-core.

2020-02-21T17:59:56.031 INFO:teuthology.orchestra.run.smithi060.stdout:dpkg: error processing archive /tmp/apt-dpkg-install-YpwLHV/044-ceph-mgr_15.1.0-1037-ga6b324b-1bionic_amd64.deb (--unpack):
2020-02-21T17:59:56.031 INFO:teuthology.orchestra.run.smithi060.stdout: trying to overwrite '/usr/share/ceph/mgr/alerts/__init__.py', which is also in package ceph-mgr-modules-core 15.1.0-1037-ga6b324b-1bionic

Broken by 589626464d475b4ad96905fbddf11a5782a040f0

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/debian/ceph-mgr-modules-core.install b/debian/ceph-mgr-modules-core.install
index 903a4d8b014a5e1f1acdc8300d5b7d9ed002ab27..bdb687a64c96a7b9a10c2ca8d78179ee2586f7da 100644 (file)
--- a/debian/ceph-mgr-modules-core.install
+++ b/debian/ceph-mgr-modules-core.install
@@ -8,6 +8,7 @@ usr/share/ceph/mgr/iostat
 usr/share/ceph/mgr/localpool
 usr/share/ceph/mgr/orchestrator
 usr/share/ceph/mgr/osd_perf_query
+usr/share/ceph/mgr/osd_support
 usr/share/ceph/mgr/pg_autoscaler
 usr/share/ceph/mgr/progress
 usr/share/ceph/mgr/prometheus

diff --git a/debian/ceph-mgr.install b/debian/ceph-mgr.install
index 0486462a43fb118d5e2c1aae394a57beb93542e5..fd7b68e82c746dbc33e710843ccae6c128cc81d3 100644 (file)
--- a/debian/ceph-mgr.install
+++ b/debian/ceph-mgr.install
@@ -1,27 +1,4 @@
 lib/systemd/system/ceph-mgr*
 usr/bin/ceph-mgr
-usr/share/ceph/mgr/alerts
-usr/share/ceph/mgr/balancer
-usr/share/ceph/mgr/crash
-usr/share/ceph/mgr/devicehealth
-usr/share/ceph/mgr/influx
-usr/share/ceph/mgr/insights
-usr/share/ceph/mgr/iostat
-usr/share/ceph/mgr/localpool
 usr/share/ceph/mgr/mgr_module.*
 usr/share/ceph/mgr/mgr_util.*
-usr/share/ceph/mgr/orchestrator
-usr/share/ceph/mgr/osd_perf_query
-usr/share/ceph/mgr/osd_support
-usr/share/ceph/mgr/pg_autoscaler
-usr/share/ceph/mgr/progress
-usr/share/ceph/mgr/prometheus
-usr/share/ceph/mgr/rbd_support
-usr/share/ceph/mgr/restful
-usr/share/ceph/mgr/selftest
-usr/share/ceph/mgr/status
-usr/share/ceph/mgr/test_orchestrator
-usr/share/ceph/mgr/telegraf
-usr/share/ceph/mgr/telemetry
-usr/share/ceph/mgr/volumes
-usr/share/ceph/mgr/zabbix