mgr/nvmeof: intergrate module into build and debian pkg

Fixes: https://tracker.ceph.com/issues/74702
Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 18cd57b26833e0181627f59ff6f3c901c0b6d298..f0f6a50c56daa09326736bf7d10fdb71dace3195 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -2015,6 +2015,7 @@ fi
 %{_datadir}/ceph/mgr/telemetry
 %{_datadir}/ceph/mgr/test_orchestrator
 %{_datadir}/ceph/mgr/volumes
+%{_datadir}/ceph/mgr/nvmeof
 
 %files mgr-rook
 %{_datadir}/ceph/mgr/rook

diff --git a/debian/ceph-mgr-modules-core.install b/debian/ceph-mgr-modules-core.install
index 90359a8e3e73f7e3f3fe45e7be845dfea15133d4..17ed984b02f613b4dde38d55924d7979520cb35f 100644 (file)
--- a/debian/ceph-mgr-modules-core.install
+++ b/debian/ceph-mgr-modules-core.install
@@ -25,3 +25,4 @@ usr/share/ceph/mgr/telegraf
 usr/share/ceph/mgr/telemetry
 usr/share/ceph/mgr/test_orchestrator
 usr/share/ceph/mgr/volumes
+usr/share/ceph/mgr/nvmeof

diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index 9e900f859d701c1536b98266772eaff008ee3327..d4032eb1dd7c227e33669e50448cba3134a73e73 100644 (file)
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -27,6 +27,7 @@ set(mgr_modules
   devicehealth
   diskprediction_local
   # hello is an example for developers, not for user
+  nvmeof
   influx
   insights
   iostat

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index c2deb627261ecb3f50da391ff5b68e90205ff88b..35d7f972d00e12f78346c76d8039a8c6bf5e77fd 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -93,6 +93,7 @@ commands =
            -m devicehealth \
            -m diskprediction_local \
            -m hello \
+           -m nvmeof \
            -m influx \
            -m iostat \
            -m localpool \
@@ -146,6 +147,7 @@ modules =
     devicehealth \
     diskprediction_local \
     hello \
+    nvmeof \
     iostat \
     localpool \
     mgr_module.py \