From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 2 Sep 2020 14:05:25 +0000 (+0200)
Subject: Revert "mgr/osd_support: remove module and all traces"
X-Git-Tag: v16.1.0~1225^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36949%2Fhead;p=ceph.git

Revert "mgr/osd_support: remove module and all traces"

This reverts commit a55c1dd0fac826978edf22e448c3456e7634cbc3.

Kept to keep upgrades from older point releases working.
This module can be removed as soon as we no longer
support upgrades from old octopus point releases.

Revert "build/debian: remove osd_support"

This reverts commit 8ff2824beb78dfd03710e94302f038ea70fb4561.

Fixes: https://tracker.ceph.com/issues/47109
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index fe193aec60ed..0c0eb9e97898 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1641,6 +1641,7 @@ fi
 %{_datadir}/ceph/mgr/mds_autoscaler
 %{_datadir}/ceph/mgr/orchestrator
 %{_datadir}/ceph/mgr/osd_perf_query
+%{_datadir}/ceph/mgr/osd_support
 %{_datadir}/ceph/mgr/pg_autoscaler
 %{_datadir}/ceph/mgr/progress
 %{_datadir}/ceph/mgr/prometheus
diff --git a/debian/ceph-mgr-modules-core.install b/debian/ceph-mgr-modules-core.install
index ac9ddd201c7f..f0f18065bf68 100644
--- 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/src/pybind/mgr/osd_support/__init__.py b/src/pybind/mgr/osd_support/__init__.py
new file mode 100644
index 000000000000..88ed2b9f57c1
--- /dev/null
+++ b/src/pybind/mgr/osd_support/__init__.py
@@ -0,0 +1 @@
+from .module import OSDSupport
diff --git a/src/pybind/mgr/osd_support/module.py b/src/pybind/mgr/osd_support/module.py
new file mode 100644
index 000000000000..1f3e137bbc25
--- /dev/null
+++ b/src/pybind/mgr/osd_support/module.py
@@ -0,0 +1,19 @@
+from mgr_module import MgrModule
+
+
+class OSDSupport(MgrModule):
+    # Kept to keep upgrades from older point releases working.
+    # This module can be removed as soon as we no longer
+    # support upgrades from old octopus point releases.
+
+    # On the other hand, if you find a use for this module,
+    # Feel free to use it!
+
+    COMMANDS = []
+
+    MODULE_OPTIONS: []
+
+    NATIVE_OPTIONS: []
+
+    def __init__(self, *args, **kwargs):
+        super(OSDSupport, self).__init__(*args, **kwargs)