mgr/cephadm: Adding python natsort module

Needed by: https://tracker.ceph.com/issues/54026

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 7e646d99589205633a21e19cbdc11b7999ae5da1)

Conflicts:
	debian/control

diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index a9c97a85deb17cb9852b9682199f073d851d70cc..4e4a501e694086a2f3dd1477546b12032eac642d 100644 (file)
--- a/admin/doc-requirements.txt
+++ b/admin/doc-requirements.txt
@@ -16,3 +16,4 @@ typed-ast
 sphinxcontrib-openapi
 sphinxcontrib-seqdiag
 mistune < 2.0.0
+natsort

diff --git a/ceph.spec.in b/ceph.spec.in
index cb3fa2d3677401eff01c04513197e480689979d9..649247308a79f94583889b6f1ffdb74182f8a25e 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -666,6 +666,7 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{python3_pkgversion}-asyncssh
+Requires:       python%{python3_pkgversion}-natsort
 Requires:       cephadm = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?suse_version}
 Requires:       openssh

diff --git a/debian/control b/debian/control
index 2f68285c7ae12b1beb3f172dd584081c6c9db1a4..7f97e43882bbfe70a65ad9a5477c1fa2ed9f1ba0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -348,7 +348,8 @@ Depends: ceph-mgr (= ${binary:Version}),
          ${python:Depends},
          openssh-client,
          python3-jinja2,
-         python3-cherrypy3
+         python3-cherrypy3,
+         python3-natsort
 Description: cephadm orchestrator module for ceph-mgr
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,

diff --git a/src/pybind/mgr/dashboard/requirements.txt b/src/pybind/mgr/dashboard/requirements.txt
index 3aa1054dbe89767c419f61d21598509919e1be3c..2901e9d193d6d6e5b1955025424ca949f7d784fd 100644 (file)
--- a/src/pybind/mgr/dashboard/requirements.txt
+++ b/src/pybind/mgr/dashboard/requirements.txt
@@ -9,3 +9,4 @@ Routes
 prettytable
 pytest
 pyyaml
+natsort

diff --git a/src/pybind/mgr/requirements-required.txt b/src/pybind/mgr/requirements-required.txt
index d71f25a027f47bee6e56eebda19a08b08ce6eed5..226425f139202272452f84e6b98c75f991e7141d 100644 (file)
--- a/src/pybind/mgr/requirements-required.txt
+++ b/src/pybind/mgr/requirements-required.txt
@@ -13,3 +13,4 @@ pyyaml
 requests-mock
 scipy
 werkzeug
+natsort